From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Hyman Huang" <yong.huang@smartx.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Hanna Reitz" <hreitz@redhat.com>,
qemu-block@nongnu.org, qemu-stable@nongnu.org,
"Laurent Vivier" <lvivier@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>
Subject: [PULL 03/10] crypto: check gnutls & gcrypt support the requested pbkdf hash
Date: Mon, 9 Sep 2024 15:16:28 +0100 [thread overview]
Message-ID: <20240909141635.1459701-4-berrange@redhat.com> (raw)
In-Reply-To: <20240909141635.1459701-1-berrange@redhat.com>
Both gnutls and gcrypt can be configured to exclude support for certain
algorithms via a runtime check against system crypto policies. Thus it
is not sufficient to have a compile time test for hash support in their
pbkdf implementations.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
crypto/pbkdf-gcrypt.c | 2 +-
crypto/pbkdf-gnutls.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/crypto/pbkdf-gcrypt.c b/crypto/pbkdf-gcrypt.c
index a8d8e64f4d..bc0719c831 100644
--- a/crypto/pbkdf-gcrypt.c
+++ b/crypto/pbkdf-gcrypt.c
@@ -33,7 +33,7 @@ bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash)
case QCRYPTO_HASH_ALG_SHA384:
case QCRYPTO_HASH_ALG_SHA512:
case QCRYPTO_HASH_ALG_RIPEMD160:
- return true;
+ return qcrypto_hash_supports(hash);
default:
return false;
}
diff --git a/crypto/pbkdf-gnutls.c b/crypto/pbkdf-gnutls.c
index 2dfbbd382c..911b565bea 100644
--- a/crypto/pbkdf-gnutls.c
+++ b/crypto/pbkdf-gnutls.c
@@ -33,7 +33,7 @@ bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash)
case QCRYPTO_HASH_ALG_SHA384:
case QCRYPTO_HASH_ALG_SHA512:
case QCRYPTO_HASH_ALG_RIPEMD160:
- return true;
+ return qcrypto_hash_supports(hash);
default:
return false;
}
--
2.45.2
next prev parent reply other threads:[~2024-09-09 14:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-09 14:16 [PULL 00/10] Crypto fixes patches Daniel P. Berrangé
2024-09-09 14:16 ` [PULL 01/10] iotests: fix expected output from gnutls Daniel P. Berrangé
2024-09-09 14:16 ` [PULL 02/10] crypto: run qcrypto_pbkdf2_count_iters in a new thread Daniel P. Berrangé
2024-09-09 14:16 ` Daniel P. Berrangé [this message]
2024-09-09 14:16 ` [PULL 04/10] tests/unit: always build the pbkdf crypto unit test Daniel P. Berrangé
2024-09-09 14:16 ` [PULL 05/10] tests/unit: build pbkdf test on macOS Daniel P. Berrangé
2024-09-09 14:16 ` [PULL 06/10] crypto: avoid leak of ctx when bad cipher mode is given Daniel P. Berrangé
2024-09-09 14:16 ` [PULL 07/10] crypto: use consistent error reporting pattern for unsupported cipher modes Daniel P. Berrangé
2024-09-09 14:16 ` [PULL 08/10] crypto: Define macros for hash algorithm digest lengths Daniel P. Berrangé
2024-09-09 14:16 ` [PULL 09/10] crypto: Support SHA384 hash when using glib Daniel P. Berrangé
2024-09-09 14:16 ` [PULL 10/10] crypto: Introduce x509 utils Daniel P. Berrangé
2025-03-18 16:44 ` Peter Maydell
2025-03-18 17:01 ` Dorjoy Chowdhury
2024-09-09 16:06 ` [PULL 00/10] Crypto fixes patches Peter Maydell
2024-09-11 5:59 ` Michael Tokarev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240909141635.1459701-4-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=thuth@redhat.com \
--cc=yong.huang@smartx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).