[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 07/12] qcrypto-luks: purge unused error codes from o
From: |
Maxim Levitsky |
Subject: |
[Qemu-block] [PATCH 07/12] qcrypto-luks: purge unused error codes from open callback |
Date: |
Thu, 12 Sep 2019 12:17:05 +0300 |
These values are not used by generic crypto code anyway
Signed-off-by: Maxim Levitsky <address@hidden>
---
crypto/block-luks.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index f3bfc921b2..ba63e9b442 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -675,13 +675,13 @@ qcrypto_block_luks_open(QCryptoBlock *block,
if (memcmp(luks->header.magic, qcrypto_block_luks_magic,
QCRYPTO_BLOCK_LUKS_MAGIC_LEN) != 0) {
error_setg(errp, "Volume is not in LUKS format");
- ret = -EINVAL;
+ ret = -1;
goto fail;
}
if (luks->header.version != QCRYPTO_BLOCK_LUKS_VERSION) {
error_setg(errp, "LUKS version %" PRIu32 " is not supported",
luks->header.version);
- ret = -ENOTSUP;
+ ret = -1;
goto fail;
}
@@ -697,7 +697,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
*/
ivgen_name = strchr(cipher_mode, '-');
if (!ivgen_name) {
- ret = -EINVAL;
+ ret = -1;
error_setg(errp, "Unexpected cipher mode string format %s",
cipher_mode);
goto fail;
@@ -715,7 +715,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
luks->ivgen_hash_alg = qcrypto_block_luks_hash_name_lookup(ivhash_name,
&local_err);
if (local_err) {
- ret = -ENOTSUP;
+ ret = -1;
error_propagate(errp, local_err);
goto fail;
}
@@ -724,7 +724,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
luks->cipher_mode = qcrypto_block_luks_cipher_mode_lookup(cipher_mode,
&local_err);
if (local_err) {
- ret = -ENOTSUP;
+ ret = -1;
error_propagate(errp, local_err);
goto fail;
}
@@ -735,7 +735,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
luks->header.master_key_len,
&local_err);
if (local_err) {
- ret = -ENOTSUP;
+ ret = -1;
error_propagate(errp, local_err);
goto fail;
}
@@ -744,7 +744,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
qcrypto_block_luks_hash_name_lookup(luks->header.hash_spec,
&local_err);
if (local_err) {
- ret = -ENOTSUP;
+ ret = -1;
error_propagate(errp, local_err);
goto fail;
}
@@ -752,14 +752,14 @@ qcrypto_block_luks_open(QCryptoBlock *block,
luks->ivgen_alg = qcrypto_block_luks_ivgen_name_lookup(ivgen_name,
&local_err);
if (local_err) {
- ret = -ENOTSUP;
+ ret = -1;
error_propagate(errp, local_err);
goto fail;
}
if (luks->ivgen_alg == QCRYPTO_IVGEN_ALG_ESSIV) {
if (!ivhash_name) {
- ret = -EINVAL;
+ ret = -1;
error_setg(errp, "Missing IV generator hash specification");
goto fail;
}
@@ -768,7 +768,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
luks->ivgen_hash_alg,
&local_err);
if (local_err) {
- ret = -ENOTSUP;
+ ret = -1;
error_propagate(errp, local_err);
goto fail;
}
@@ -795,7 +795,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
masterkey,
readfunc, opaque,
errp) < 0) {
- ret = -EACCES;
+ ret = -1;
goto fail;
}
@@ -813,7 +813,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
luks->header.master_key_len,
errp);
if (!block->ivgen) {
- ret = -ENOTSUP;
+ ret = -1;
goto fail;
}
@@ -825,7 +825,7 @@ qcrypto_block_luks_open(QCryptoBlock *block,
n_threads,
errp);
if (ret < 0) {
- ret = -ENOTSUP;
+ ret = -1;
goto fail;
}
}
--
2.17.2
- [Qemu-block] [PATCH 00/12] crypto/luks: preparation for encryption key managment, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 01/12] block-crypto: misc refactoring, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 02/12] qcrypto-luks: rename some fields in QCryptoBlockLUKSHeader, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 03/12] qcrypto-luks: don't overwrite cipher_mode in header, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 05/12] qcrypto-luks: pass keyslot index rather that pointer to the keyslot, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 04/12] qcrypto-luks: simplify masterkey and masterkey length, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 06/12] qcrypto-luks: use the parsed encryption settings in QCryptoBlockLUKS, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 07/12] qcrypto-luks: purge unused error codes from open callback,
Maxim Levitsky <=
- [Qemu-block] [PATCH 08/12] qcrypto-luks: extract store and load header, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 09/12] qcrypto-luks: extract check and parse header, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 10/12] qcrypto-luks: extract store key function, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 11/12] qcrypto-luks: simplify the math used for keyslot locations, Maxim Levitsky, 2019/09/12
- [Qemu-block] [PATCH 12/12] qcrypto-luks: more rigorous header checking, Maxim Levitsky, 2019/09/12