From: Niels Möller <nisse@lysator.liu.se>
Date: Fri, 11 Apr 2014 14:08:31 +0000 (+0200)
Subject: In aead tests, use aead->digest_size.
X-Git-Tag: nettle_3.0_release_20140607~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbecbf2b3726630aeb79ed6cee68079df9727095;p=thirdparty%2Fnettle.git

In aead tests, use aead->digest_size.
---

diff --git a/ChangeLog b/ChangeLog
index 8ec42181..b69a29c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-04-11  Niels Möller  <nisse@lysator.liu.se>
 
+	* testsuite/testutils.c (test_aead): Use aead->digest_size.
+
 	* configure.ac: Skip GMP tests if public key support is disabled.
 
 	* eax.c (block16_xor): Fixed bug effecting 32-bit platforms.
diff --git a/testsuite/testutils.c b/testsuite/testutils.c
index 4fa3a18d..b273bece 100644
--- a/testsuite/testutils.c
+++ b/testsuite/testutils.c
@@ -478,19 +478,19 @@ test_aead(const struct nettle_aead *aead,
 {
   void *ctx = xalloc(aead->context_size);
   uint8_t *data;
-  uint8_t *buffer = xalloc(aead->block_size);
+  uint8_t *buffer = xalloc(aead->digest_size);
   size_t length;
 
   ASSERT (cleartext->length == ciphertext->length);
   length = cleartext->length;
 
   ASSERT (key->length == aead->key_size);
-  ASSERT (digest->length <= aead->block_size);
+  ASSERT (digest->length <= aead->digest_size);
 
   data = xalloc(length);
   
   /* encryption */
-  memset(buffer, 0, aead->block_size);
+  memset(buffer, 0, aead->digest_size);
   aead->set_encrypt_key(ctx, key->data);
 
   if (nonce->length != aead->nonce_size)
@@ -513,7 +513,7 @@ test_aead(const struct nettle_aead *aead,
   ASSERT(MEMEQ(digest->length, buffer, digest->data));
 
   /* decryption */
-  memset(buffer, 0, aead->block_size);
+  memset(buffer, 0, aead->digest_size);
 
   aead->set_decrypt_key(ctx, key->data);