diff --git a/testsuite/gcm-test.c b/testsuite/gcm-test.c
index 45abde88e1cbc59fc878412164e26fdcdf41d430..1c94682684953c82b9fa8fa42d3088a57c166112 100644
--- a/testsuite/gcm-test.c
+++ b/testsuite/gcm-test.c
@@ -2,6 +2,64 @@
#include "aes.h"
#include "gcm.h"
+static void
+test_gcm_aes(unsigned key_length,
+ const uint8_t *key,
+ unsigned auth_length,
+ const uint8_t *authtext,
+ unsigned length,
+ const uint8_t *cleartext,
+ const uint8_t *ciphertext,
+ unsigned iv_length,
+ const uint8_t *iv,
+ const uint8_t *digest)
+{
+ struct gcm_aes_ctx ctx;
+
+ uint8_t *data = xalloc(length);
+ uint8_t buffer[GCM_BLOCK_SIZE];
+
+ /* encryption */
+ memset(buffer, 0, sizeof(buffer));
+ gcm_aes_set_key(&ctx, key_length, key);
+
+ gcm_aes_set_iv(&ctx, iv_length, iv);
+
+ if (auth_length)
+ gcm_aes_auth(&ctx, auth_length, authtext);
+
+ if (length)
+ gcm_aes_encrypt(&ctx, length, data, cleartext);
+
+ gcm_aes_digest(&ctx, GCM_BLOCK_SIZE, buffer);
+
+ if (!MEMEQ(length, data, ciphertext))
+ FAIL();
+
+ if (!MEMEQ(GCM_BLOCK_SIZE, buffer, digest))
+ FAIL();
+
+ /* decryption */
+ memset(buffer, 0, sizeof(buffer));
+ gcm_aes_set_iv(&ctx, iv_length, iv);
+
+ if (auth_length)
+ gcm_aes_auth(&ctx, auth_length, authtext);
+
+ if (length)
+ gcm_aes_decrypt(&ctx, length, data, data);
+
+ gcm_aes_digest(&ctx, GCM_BLOCK_SIZE, buffer);
+
+ if (!MEMEQ(length, data, cleartext))
+ FAIL();
+
+ if (!MEMEQ(GCM_BLOCK_SIZE, buffer, digest))
+ FAIL();
+
+ free(data);
+}
+
int
test_main(void)
{
@@ -11,90 +69,84 @@ test_main(void)
*/
/* Test case 1 */
- test_cipher_gcm(&nettle_aes128,
- /* key */HL("00000000000000000000000000000000"),
- /* auth data */ HL(""),
- /* plaintext */HL(""),
- /* ciphertext*/H(""),
- /* IV */HL("000000000000000000000000"),
- /* tag */H("58e2fccefa7e3061367f1d57a4e7455a"));
+ test_gcm_aes(/* key */HL("00000000000000000000000000000000"),
+ /* auth data */ HL(""),
+ /* plaintext */HL(""),
+ /* ciphertext*/H(""),
+ /* IV */HL("000000000000000000000000"),
+ /* tag */H("58e2fccefa7e3061367f1d57a4e7455a"));
/* Test case 2 */
- test_cipher_gcm(&nettle_aes128,
- HL("00000000000000000000000000000000"),
- HL(""),
- HL("00000000000000000000000000000000"),
- H("0388dace60b6a392f328c2b971b2fe78"),
- HL("000000000000000000000000"),
- H("ab6e47d42cec13bdf53a67b21257bddf"));
+ test_gcm_aes(HL("00000000000000000000000000000000"),
+ HL(""),
+ HL("00000000000000000000000000000000"),
+ H("0388dace60b6a392f328c2b971b2fe78"),
+ HL("000000000000000000000000"),
+ H("ab6e47d42cec13bdf53a67b21257bddf"));
/* Test case 3 */
- test_cipher_gcm(&nettle_aes128,
- HL("feffe9928665731c6d6a8f9467308308"),
- HL(""),
- HL("d9313225f88406e5a55909c5aff5269a"
- "86a7a9531534f7da2e4c303d8a318a72"
- "1c3c0c95956809532fcf0e2449a6b525"
- "b16aedf5aa0de657ba637b391aafd255"),
- H("42831ec2217774244b7221b784d0d49c"
- "e3aa212f2c02a4e035c17e2329aca12e"
- "21d514b25466931c7d8f6a5aac84aa05"
- "1ba30b396a0aac973d58e091473f5985"),
- HL("cafebabefacedbaddecaf888"),
- H("4d5c2af327cd64a62cf35abd2ba6fab4"));
+ test_gcm_aes(HL("feffe9928665731c6d6a8f9467308308"),
+ HL(""),
+ HL("d9313225f88406e5a55909c5aff5269a"
+ "86a7a9531534f7da2e4c303d8a318a72"
+ "1c3c0c95956809532fcf0e2449a6b525"
+ "b16aedf5aa0de657ba637b391aafd255"),
+ H("42831ec2217774244b7221b784d0d49c"
+ "e3aa212f2c02a4e035c17e2329aca12e"
+ "21d514b25466931c7d8f6a5aac84aa05"
+ "1ba30b396a0aac973d58e091473f5985"),
+ HL("cafebabefacedbaddecaf888"),
+ H("4d5c2af327cd64a62cf35abd2ba6fab4"));
/* Test case 4 */
- test_cipher_gcm(&nettle_aes128,
- HL("feffe9928665731c6d6a8f9467308308"),
- HL("feedfacedeadbeeffeedfacedeadbeef"
- "abaddad2"),
- HL("d9313225f88406e5a55909c5aff5269a"
- "86a7a9531534f7da2e4c303d8a318a72"
- "1c3c0c95956809532fcf0e2449a6b525"
- "b16aedf5aa0de657ba637b39"),
- H("42831ec2217774244b7221b784d0d49c"
- "e3aa212f2c02a4e035c17e2329aca12e"
- "21d514b25466931c7d8f6a5aac84aa05"
- "1ba30b396a0aac973d58e091"),
- HL("cafebabefacedbaddecaf888"),
- H("5bc94fbc3221a5db94fae95ae7121a47"));
+ test_gcm_aes(HL("feffe9928665731c6d6a8f9467308308"),
+ HL("feedfacedeadbeeffeedfacedeadbeef"
+ "abaddad2"),
+ HL("d9313225f88406e5a55909c5aff5269a"
+ "86a7a9531534f7da2e4c303d8a318a72"
+ "1c3c0c95956809532fcf0e2449a6b525"
+ "b16aedf5aa0de657ba637b39"),
+ H("42831ec2217774244b7221b784d0d49c"
+ "e3aa212f2c02a4e035c17e2329aca12e"
+ "21d514b25466931c7d8f6a5aac84aa05"
+ "1ba30b396a0aac973d58e091"),
+ HL("cafebabefacedbaddecaf888"),
+ H("5bc94fbc3221a5db94fae95ae7121a47"));
#if 0
/* Unsupported IV size. */
/* Test case 5 */
- test_cipher_gcm(&nettle_aes128,
- HL("feffe9928665731c6d6a8f9467308308"),
- HL("feedfacedeadbeeffeedfacedeadbeef"
- "abaddad2"),
- HL("d9313225f88406e5a55909c5aff5269a"
- "86a7a9531534f7da2e4c303d8a318a72"
- "1c3c0c95956809532fcf0e2449a6b525"
- "b16aedf5aa0de657ba637b39"),
- HL("cafebabefacedbad"),
- H("61353b4c2806934a777ff51fa22a4755"
- "699b2a714fcdc6f83766e5f97b6c7423"
- "73806900e49f24b22b097544d4896b42"
- "4989b5e1ebac0f07c23f4598"),
- H("3612d2e79e3b0785561be14aaca2fccb"));
+ test_gcm_aes(HL("feffe9928665731c6d6a8f9467308308"),
+ HL("feedfacedeadbeeffeedfacedeadbeef"
+ "abaddad2"),
+ HL("d9313225f88406e5a55909c5aff5269a"
+ "86a7a9531534f7da2e4c303d8a318a72"
+ "1c3c0c95956809532fcf0e2449a6b525"
+ "b16aedf5aa0de657ba637b39"),
+ HL("cafebabefacedbad"),
+ H("61353b4c2806934a777ff51fa22a4755"
+ "699b2a714fcdc6f83766e5f97b6c7423"
+ "73806900e49f24b22b097544d4896b42"
+ "4989b5e1ebac0f07c23f4598"),
+ H("3612d2e79e3b0785561be14aaca2fccb"));
/* Test case 6 */
- test_cipher_gcm(&nettle_aes128,
- HL("feffe9928665731c6d6a8f9467308308"),
- HL("feedfacedeadbeeffeedfacedeadbeef"
- "abaddad2"),
- HL("d9313225f88406e5a55909c5aff5269a"
- "86a7a9531534f7da2e4c303d8a318a72"
- "1c3c0c95956809532fcf0e2449a6b525"
- "b16aedf5aa0de657ba637b39"),
- H("8ce24998625615b603a033aca13fb894"
- "be9112a5c3a211a8ba262a3cca7e2ca7"
- "01e4a9a4fba43c90ccdcb281d48c7c6f"
- "d62875d2aca417034c34aee5"),
- HL("9313225df88406e555909c5aff5269aa"
- "6a7a9538534f7da1e4c303d2a318a728"
- "c3c0c95156809539fcf0e2429a6b5254"
- "16aedbf5a0de6a57a637b39b"),
- H("619cc5aefffe0bfa462af43c1699d050"));
+ test_gcm_aes(HL("feffe9928665731c6d6a8f9467308308"),
+ HL("feedfacedeadbeeffeedfacedeadbeef"
+ "abaddad2"),
+ HL("d9313225f88406e5a55909c5aff5269a"
+ "86a7a9531534f7da2e4c303d8a318a72"
+ "1c3c0c95956809532fcf0e2449a6b525"
+ "b16aedf5aa0de657ba637b39"),
+ H("8ce24998625615b603a033aca13fb894"
+ "be9112a5c3a211a8ba262a3cca7e2ca7"
+ "01e4a9a4fba43c90ccdcb281d48c7c6f"
+ "d62875d2aca417034c34aee5"),
+ HL("9313225df88406e555909c5aff5269aa"
+ "6a7a9538534f7da1e4c303d2a318a728"
+ "c3c0c95156809539fcf0e2429a6b5254"
+ "16aedbf5a0de6a57a637b39b"),
+ H("619cc5aefffe0bfa462af43c1699d050"));
#endif
diff --git a/testsuite/testutils.c b/testsuite/testutils.c
index 3228cb73484dde5e055968b5b34e6b93997cba69..d7886e1be2ec0e88ecc75f2fad02ffe202e18740 100644
--- a/testsuite/testutils.c
+++ b/testsuite/testutils.c
@@ -296,71 +296,6 @@ test_cipher_ctr(const struct nettle_cipher *cipher,
free(ctr);
}
-void
-test_cipher_gcm(const struct nettle_cipher *cipher,
- unsigned key_length,
- const uint8_t *key,
- unsigned auth_length,
- const uint8_t *authtext,
- unsigned length,
- const uint8_t *cleartext,
- const uint8_t *ciphertext,
- unsigned iv_length,
- const uint8_t *iv,
- const uint8_t *digest)
-{
- struct gcm_ctx gctx;
- void *cipher_ctx = xalloc(cipher->context_size);
- uint8_t *data = xalloc(length);
- uint8_t buffer[GCM_BLOCK_SIZE];
-
- /* encryption */
- memset(buffer, 0, sizeof(buffer));
- cipher->set_encrypt_key(cipher_ctx, key_length, key);
-
- gcm_set_key(&gctx, cipher_ctx, cipher->encrypt);
- gcm_set_iv(&gctx, iv_length, iv);
-
- if (auth_length)
- gcm_auth(&gctx, auth_length, authtext);
-
- if (length)
- gcm_encrypt(&gctx, cipher_ctx, cipher->encrypt,
- length, data, cleartext);
-
- gcm_digest(&gctx, cipher_ctx, cipher->encrypt,
- GCM_BLOCK_SIZE, buffer);
-
- if (!MEMEQ(length, data, ciphertext))
- FAIL();
-
- if (!MEMEQ(GCM_BLOCK_SIZE, buffer, digest))
- FAIL();
-
- /* decryption */
- memset(buffer, 0, sizeof(buffer));
- gcm_set_iv(&gctx, iv_length, iv);
-
- if (auth_length)
- gcm_auth(&gctx, auth_length, authtext);
-
- if (length)
- gcm_decrypt(&gctx, cipher_ctx, cipher->encrypt,
- length, data, data);
-
- gcm_digest(&gctx, cipher_ctx, cipher->encrypt,
- GCM_BLOCK_SIZE, buffer);
-
- if (!MEMEQ(length, data, cleartext))
- FAIL();
-
- if (!MEMEQ(GCM_BLOCK_SIZE, buffer, digest))
- FAIL();
-
- free(cipher_ctx);
- free(data);
-}
-
void
test_cipher_stream(const struct nettle_cipher *cipher,
unsigned key_length,
diff --git a/testsuite/testutils.h b/testsuite/testutils.h
index bbfa468dda497f9d01ba895722c04375efca4838..91ec49621cf97d9aeb339928181fbfde4060e3c6 100644
--- a/testsuite/testutils.h
+++ b/testsuite/testutils.h
@@ -105,19 +105,6 @@ test_cipher_ctr(const struct nettle_cipher *cipher,
const uint8_t *ciphertext,
const uint8_t *iv);
-void
-test_cipher_gcm(const struct nettle_cipher *cipher,
- unsigned key_length,
- const uint8_t *key,
- unsigned auth_length,
- const uint8_t *authtext,
- unsigned length,
- const uint8_t *cleartext,
- const uint8_t *ciphertext,
- unsigned iv_length,
- const uint8_t *iv,
- const uint8_t *digest);
-
void
test_cipher_stream(const struct nettle_cipher *cipher,
unsigned key_length,