[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/11] qcrypto-luks: don't overwrite cipher_mode in header
From: |
Daniel P . Berrangé |
Subject: |
[PULL 02/11] qcrypto-luks: don't overwrite cipher_mode in header |
Date: |
Fri, 27 Sep 2019 10:59:17 +0100 |
From: Maxim Levitsky <address@hidden>
This way we can store the header we loaded, which
will be used in key management code
Signed-off-by: Maxim Levitsky <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
---
crypto/block-luks.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index f12fa2d270..25f8a9f1c4 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -645,6 +645,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
QCryptoHashAlgorithm hash;
QCryptoHashAlgorithm ivhash;
g_autofree char *password = NULL;
+ g_autofree char *cipher_mode = NULL;
if (!(flags & QCRYPTO_BLOCK_OPEN_NO_IO)) {
if (!options->u.luks.key_secret) {
@@ -701,6 +702,8 @@ qcrypto_block_luks_open(QCryptoBlock *block,
goto fail;
}
+ cipher_mode = g_strdup(luks->header.cipher_mode);
+
/*
* The cipher_mode header contains a string that we have
* to further parse, of the format
@@ -709,11 +712,11 @@ qcrypto_block_luks_open(QCryptoBlock *block,
*
* eg cbc-essiv:sha256, cbc-plain64
*/
- ivgen_name = strchr(luks->header.cipher_mode, '-');
+ ivgen_name = strchr(cipher_mode, '-');
if (!ivgen_name) {
ret = -EINVAL;
error_setg(errp, "Unexpected cipher mode string format %s",
- luks->header.cipher_mode);
+ cipher_mode);
goto fail;
}
*ivgen_name = '\0';
@@ -735,7 +738,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
}
}
- ciphermode =
qcrypto_block_luks_cipher_mode_lookup(luks->header.cipher_mode,
+ ciphermode = qcrypto_block_luks_cipher_mode_lookup(cipher_mode,
&local_err);
if (local_err) {
ret = -ENOTSUP;
--
2.21.0
- [PULL 03/11] qcrypto-luks: simplify masterkey and masterkey length, (continued)
- [PULL 03/11] qcrypto-luks: simplify masterkey and masterkey length, Daniel P . Berrangé, 2019/09/27
- [PULL 05/11] qcrypto-luks: use the parsed encryption settings in QCryptoBlockLUKS, Daniel P . Berrangé, 2019/09/27
- [PULL 11/11] qcrypto-luks: more rigorous header checking, Daniel P . Berrangé, 2019/09/27
- [PULL 04/11] qcrypto-luks: pass keyslot index rather that pointer to the keyslot, Daniel P . Berrangé, 2019/09/27
- [PULL 08/11] qcrypto-luks: extract check and parse header, Daniel P . Berrangé, 2019/09/27
- [PULL 09/11] qcrypto-luks: extract store key function, Daniel P . Berrangé, 2019/09/27
- [PULL 07/11] qcrypto-luks: extract store and load header, Daniel P . Berrangé, 2019/09/27
- [PULL 01/11] qcrypto-luks: rename some fields in QCryptoBlockLUKSHeader, Daniel P . Berrangé, 2019/09/27
- [PULL 06/11] qcrypto-luks: purge unused error codes from open callback, Daniel P . Berrangé, 2019/09/27
- [PULL 10/11] qcrypto-luks: simplify the math used for keyslot locations, Daniel P . Berrangé, 2019/09/27
- [PULL 02/11] qcrypto-luks: don't overwrite cipher_mode in header,
Daniel P . Berrangé <=
- Re: [PULL 00/11] Qcrypto next patches, Peter Maydell, 2019/09/30