[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/20] crypto: quote algorithm names in error messages
From: |
Daniel P . Berrangé |
Subject: |
[PULL 18/20] crypto: quote algorithm names in error messages |
Date: |
Thu, 27 Oct 2022 18:31:01 +0100 |
If given a malformed LUKS header, it is possible that the algorithm
names end up being an empty string. This leads to confusing error
messages unless quoting is used to highlight where the empty string
is subsituted in the error message.
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
crypto/block-luks.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index bb89c10225..df2b4105d6 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -162,7 +162,7 @@ static int qcrypto_block_luks_cipher_name_lookup(const char
*name,
}
}
- error_setg(errp, "Algorithm %s with key size %d bytes not supported",
+ error_setg(errp, "Algorithm '%s' with key size %d bytes not supported",
name, key_bytes);
return 0;
}
@@ -198,7 +198,7 @@ static int qcrypto_block_luks_name_lookup(const char *name,
int ret = qapi_enum_parse(map, name, -1, NULL);
if (ret < 0) {
- error_setg(errp, "%s %s not supported", type, name);
+ error_setg(errp, "%s '%s' not supported", type, name);
return 0;
}
return ret;
@@ -592,7 +592,7 @@ qcrypto_block_luks_parse_header(QCryptoBlockLUKS *luks,
Error **errp)
*/
ivgen_name = strchr(cipher_mode, '-');
if (!ivgen_name) {
- error_setg(errp, "Unexpected cipher mode string format %s",
+ error_setg(errp, "Unexpected cipher mode string format '%s'",
luks->header.cipher_mode);
return -1;
}
--
2.37.3
- [PULL 14/20] crypto: strengthen the check for key slots overlapping with LUKS header, (continued)
- [PULL 14/20] crypto: strengthen the check for key slots overlapping with LUKS header, Daniel P . Berrangé, 2022/10/27
- [PULL 15/20] crypto: check that LUKS PBKDF2 iterations count is non-zero, Daniel P . Berrangé, 2022/10/27
- [PULL 07/20] scripts: check if .git exists before checking submodule status, Daniel P . Berrangé, 2022/10/27
- [PULL 06/20] seccomp: Get actual errno value from failed seccomp functions, Daniel P . Berrangé, 2022/10/27
- [PULL 13/20] crypto: validate that LUKS payload doesn't overlap with header, Daniel P . Berrangé, 2022/10/27
- [PULL 16/20] crypto: split LUKS header definitions off into file, Daniel P . Berrangé, 2022/10/27
- [PULL 17/20] crypto: split off helpers for converting LUKS header endianess, Daniel P . Berrangé, 2022/10/27
- [PULL 20/20] crypto: add test cases for many malformed LUKS header scenarios, Daniel P . Berrangé, 2022/10/27
- [PULL 12/20] crypto: enforce that key material doesn't overlap with LUKS header, Daniel P . Berrangé, 2022/10/27
- [PULL 19/20] crypto: ensure LUKS tests run with GNUTLS crypto provider, Daniel P . Berrangé, 2022/10/27
- [PULL 18/20] crypto: quote algorithm names in error messages,
Daniel P . Berrangé <=
- Re: [PULL 00/20] Crypto and I/O patches, Stefan Hajnoczi, 2022/10/31