qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kunwu <chentao@kylinos.cn>, "Cédric Le Goater" <clg@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PULL 16/17] crypto: drop obsolete back compat logic for old nettle
Date: Thu, 10 Oct 2024 17:20:23 +0100	[thread overview]
Message-ID: <20241010162024.988284-17-berrange@redhat.com> (raw)
In-Reply-To: <20241010162024.988284-1-berrange@redhat.com>

The nettle 2.x series declared all the hash functions with 'int' for
the data size. Since we dropped support for anything older than 3.4
we can assume nettle is using 'size_t' and thus avoid the back compat
looping logic.

Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 crypto/hash-nettle.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/crypto/hash-nettle.c b/crypto/hash-nettle.c
index 570ce8a645..3b847aa60e 100644
--- a/crypto/hash-nettle.c
+++ b/crypto/hash-nettle.c
@@ -135,20 +135,9 @@ int qcrypto_nettle_hash_update(QCryptoHash *hash,
     union qcrypto_hash_ctx *ctx = hash->opaque;
 
     for (int i = 0; i < niov; i++) {
-        /*
-         * Some versions of nettle have functions
-         * declared with 'int' instead of 'size_t'
-         * so to be safe avoid writing more than
-         * UINT_MAX bytes at a time
-         */
-        size_t len = iov[i].iov_len;
-        uint8_t *base = iov[i].iov_base;
-        while (len) {
-            size_t shortlen = MIN(len, UINT_MAX);
-            qcrypto_hash_alg_map[hash->alg].write(ctx, len, base);
-            len -= shortlen;
-            base += len;
-        }
+        qcrypto_hash_alg_map[hash->alg].write(ctx,
+                                              iov[i].iov_len,
+                                              iov[i].iov_base);
     }
 
     return 0;
-- 
2.46.0



  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 ` [PULL 11/17] crypto/hash-gcrypt: " Daniel P. Berrangé
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 ` Daniel P. Berrangé [this message]
2024-10-10 16:48   ` [PULL 16/17] crypto: drop obsolete back compat logic for old nettle 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-17-berrange@redhat.com \
    --to=berrange@redhat.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).