From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kunwu <chentao@kylinos.cn>, "Cédric Le Goater" <clg@redhat.com>,
"Alejandro Zeise" <alejandro.zeise@seagate.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PULL 11/17] crypto/hash-gcrypt: Remove old hash API functions
Date: Thu, 10 Oct 2024 17:20:18 +0100 [thread overview]
Message-ID: <20241010162024.988284-12-berrange@redhat.com> (raw)
In-Reply-To: <20241010162024.988284-1-berrange@redhat.com>
From: Alejandro Zeise <alejandro.zeise@seagate.com>
Removes old hash implementation in the gcrypt hash driver.
Signed-off-by: Alejandro Zeise <alejandro.zeise@seagate.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
[ clg: - Fixed spelling in commit log ]
Signed-off-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
crypto/hash-gcrypt.c | 67 --------------------------------------------
1 file changed, 67 deletions(-)
diff --git a/crypto/hash-gcrypt.c b/crypto/hash-gcrypt.c
index cb2cb37f25..ccc3cce3f8 100644
--- a/crypto/hash-gcrypt.c
+++ b/crypto/hash-gcrypt.c
@@ -45,72 +45,6 @@ gboolean qcrypto_hash_supports(QCryptoHashAlgo alg)
return false;
}
-
-static int
-qcrypto_gcrypt_hash_bytesv(QCryptoHashAlgo alg,
- const struct iovec *iov,
- size_t niov,
- uint8_t **result,
- size_t *resultlen,
- Error **errp)
-{
- int i, ret;
- gcry_md_hd_t md;
- unsigned char *digest;
-
- if (!qcrypto_hash_supports(alg)) {
- error_setg(errp,
- "Unknown hash algorithm %d",
- alg);
- return -1;
- }
-
- ret = gcry_md_open(&md, qcrypto_hash_alg_map[alg], 0);
-
- if (ret < 0) {
- error_setg(errp,
- "Unable to initialize hash algorithm: %s",
- gcry_strerror(ret));
- return -1;
- }
-
- for (i = 0; i < niov; i++) {
- gcry_md_write(md, iov[i].iov_base, iov[i].iov_len);
- }
-
- ret = gcry_md_get_algo_dlen(qcrypto_hash_alg_map[alg]);
- if (ret <= 0) {
- error_setg(errp,
- "Unable to get hash length: %s",
- gcry_strerror(ret));
- goto error;
- }
- if (*resultlen == 0) {
- *resultlen = ret;
- *result = g_new0(uint8_t, *resultlen);
- } else if (*resultlen != ret) {
- error_setg(errp,
- "Result buffer size %zu is smaller than hash %d",
- *resultlen, ret);
- goto error;
- }
-
- digest = gcry_md_read(md, 0);
- if (!digest) {
- error_setg(errp,
- "No digest produced");
- goto error;
- }
- memcpy(*result, digest, *resultlen);
-
- gcry_md_close(md);
- return 0;
-
- error:
- gcry_md_close(md);
- return -1;
-}
-
static
QCryptoHash *qcrypto_gcrypt_hash_new(QCryptoHashAlgo alg, Error **errp)
{
@@ -187,7 +121,6 @@ int qcrypto_gcrypt_hash_finalize(QCryptoHash *hash,
}
QCryptoHashDriver qcrypto_hash_lib_driver = {
- .hash_bytesv = qcrypto_gcrypt_hash_bytesv,
.hash_new = qcrypto_gcrypt_hash_new,
.hash_update = qcrypto_gcrypt_hash_update,
.hash_finalize = qcrypto_gcrypt_hash_finalize,
--
2.46.0
next prev parent reply other threads:[~2024-10-10 16:24 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-10 16:20 [PULL 00/17] Crypto fixes patches Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 01/17] crypto: accumulative hashing API Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 02/17] crypto/hash-glib: Implement new hash API Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 03/17] crypto/hash-gcrypt: " Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 04/17] crypto/hash-gnutls: " Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 05/17] crypto/hash-nettle: " Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 06/17] util/iov: Introduce iov_send_recv_with_flags() Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 07/17] crypto/hash-afalg: Implement new hash API Daniel P. Berrangé
2024-10-17 6:34 ` Markus Armbruster
2024-10-10 16:20 ` [PULL 08/17] crypto/hash: Implement and use " Daniel P. Berrangé
2024-10-22 19:10 ` Thomas Huth
2024-10-23 8:15 ` Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 09/17] tests/unit/test-crypto-hash: accumulative hashing Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 10/17] crypto/hash-glib: Remove old hash API functions Daniel P. Berrangé
2024-10-10 16:20 ` Daniel P. Berrangé [this message]
2024-10-10 16:20 ` [PULL 12/17] crypto/hash-gnutls: " Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 13/17] crypto/hash-nettle: " Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 14/17] crypto/hash-afalg: " Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 15/17] crypto/hashpriv: Remove old hash API function Daniel P. Berrangé
2024-10-10 16:20 ` [PULL 16/17] crypto: drop obsolete back compat logic for old nettle Daniel P. Berrangé
2024-10-10 16:48 ` Philippe Mathieu-Daudé
2024-10-10 16:20 ` [PULL 17/17] tests/unit: Add a assert for test_io_channel_unix_listen_cleanup Daniel P. Berrangé
2024-10-11 17:19 ` [PULL 00/17] Crypto fixes patches Peter Maydell
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=20241010162024.988284-12-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alejandro.zeise@seagate.com \
--cc=chentao@kylinos.cn \
--cc=clg@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).