Skip to content

crypto: Fix reading keyfile in bd_crypto_luks_change_key #1158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vojtechtrefny wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −1
Open

crypto: Fix reading keyfile in bd_crypto_luks_change_key #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/plugins/crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1734,7 +1734,7 @@ gboolean bd_crypto_luks_change_key (const gchar *device, BDCryptoKeyslotContext
}

if (ncontext->type == BD_CRYPTO_KEYSLOT_CONTEXT_TYPE_KEYFILE) {
ret = crypt_keyfile_device_read (cd, ncontext->u.keyfile.keyfile, &key_buf, &buf_len,
ret = crypt_keyfile_device_read (cd, ncontext->u.keyfile.keyfile, &nkey_buf, &nbuf_len,
ncontext->u.keyfile.keyfile_offset, ncontext->u.keyfile.key_size, 0);
if (ret != 0) {
g_set_error (&l_error, BD_CRYPTO_ERROR, BD_CRYPTO_ERROR_KEYFILE_FAILED,
Expand Down
27 changes: 27 additions & 0 deletions tests/crypto_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,33 @@ def _change_key(self, create_fn):
succ = BlockDev.crypto_luks_change_key(self.loop_devs[0], ctx, nctx)
self.assertTrue(succ)

# old passphrase should no longer work
with self.assertRaises(GLib.GError):
BlockDev.crypto_luks_remove_key(self.loop_devs[0], ctx)

# new passphrase should work
succ = BlockDev.crypto_luks_open(self.loop_devs[0], "libblockdevTestLUKS", nctx)
self.assertTrue(succ)

succ = BlockDev.crypto_luks_close("libblockdevTestLUKS")
self.assertTrue(succ)

# try with keyfile as well
kctx = BlockDev.CryptoKeyslotContext(keyfile=self.keyfile)
succ = BlockDev.crypto_luks_change_key(self.loop_devs[0], nctx, kctx)
self.assertTrue(succ)

# old passphrase should no longer work
with self.assertRaises(GLib.GError):
BlockDev.crypto_luks_remove_key(self.loop_devs[0], nctx)

# keyfile should work
succ = BlockDev.crypto_luks_open(self.loop_devs[0], "libblockdevTestLUKS", kctx)
self.assertTrue(succ)

succ = BlockDev.crypto_luks_close("libblockdevTestLUKS")
self.assertTrue(succ)

@tag_test(TestTags.SLOW)
def test_luks_change_key(self):
self._change_key(self._luks_format)
Expand Down