krb5 commit [krb5-1.19]: Avoid rand() in aes-gen test program
Greg Hudson
ghudson at mit.edu
Mon Jul 12 12:28:44 EDT 2021
https://github.com/krb5/krb5/commit/4d9de6f63db417aa43b1a50f8c93ddb6046fb447
commit 4d9de6f63db417aa43b1a50f8c93ddb6046fb447
Author: Greg Hudson <ghudson at mit.edu>
Date: Thu Mar 25 12:00:54 2021 -0400
Avoid rand() in aes-gen test program
rand() can output different sequences on different platforms with the
same seed, and (since commit cb5f190056ef4d123c5fe5d4923982b830288438)
we want fixed output. Use specified inputs instead. Reported by Ken
Hornstein.
(cherry picked from commit ae40b2eabb8954679e55f0ae79c3aaa96974fb40)
ticket: 8992
version_fixed: 1.19.2
src/lib/crypto/builtin/aes/aes-gen.c | 97 +++++++++++++++++++++-------------
1 files changed, 61 insertions(+), 36 deletions(-)
diff --git a/src/lib/crypto/builtin/aes/aes-gen.c b/src/lib/crypto/builtin/aes/aes-gen.c
index 07d94b8..b528d37 100644
--- a/src/lib/crypto/builtin/aes/aes-gen.c
+++ b/src/lib/crypto/builtin/aes/aes-gen.c
@@ -9,29 +9,54 @@
#include "aes.h"
#define B 16U
-unsigned char key[16];
-unsigned char test_case_len[] = { B+1, 2*B-1, 2*B, 2*B+1, 3*B-1, 3*B, 4*B, };
-#define NTESTS (sizeof(test_case_len))
-struct {
- unsigned char ivec[16];
- unsigned char input[4*16];
- unsigned char output[4*16];
-} test_case[NTESTS];
+uint8_t key[16] = { 0x46, 0x64, 0x31, 0x29, 0x64, 0x86, 0xED, 0x9C,
+ 0xD7, 0x1F, 0xC2, 0x07, 0x25, 0x48, 0x20, 0xA2 };
+size_t test_case_len[] = { B+1, 2*B-1, 2*B, 2*B+1, 3*B-1, 3*B, 4*B, };
+#define NTESTS (sizeof(test_case_len) / sizeof(*test_case_len))
+uint8_t test_case[NTESTS][4 * B] = {
+ { 0xC4, 0xA8, 0x5A, 0xEB, 0x0B, 0x20, 0x41, 0x49,
+ 0x4F, 0x8B, 0xF1, 0xF8, 0xCD, 0x30, 0xF1, 0x13,
+ 0x94 },
+ { 0x22, 0x3C, 0xF8, 0xA8, 0x29, 0x95, 0x80, 0x49,
+ 0x57, 0x87, 0x6E, 0x9F, 0xA7, 0x11, 0x63, 0x50,
+ 0x6B, 0x4E, 0x5B, 0x8C, 0x8F, 0xA4, 0xDB, 0x1B,
+ 0x95, 0xD3, 0xE8, 0xC5, 0xC5, 0xFB, 0x5A },
+ { 0xE7, 0x37, 0x52, 0x90, 0x60, 0xE7, 0x10, 0xA9,
+ 0x3E, 0x97, 0x18, 0xDD, 0x3E, 0x29, 0x41, 0x8E,
+ 0x94, 0x8F, 0xE9, 0x20, 0x1F, 0x8D, 0xFB, 0x3A,
+ 0x22, 0xCF, 0x22, 0xE8, 0x94, 0x1D, 0x42, 0x7B },
+ { 0x54, 0x94, 0x0B, 0xB4, 0x7C, 0x1B, 0x5E, 0xBA,
+ 0xB2, 0x76, 0x98, 0xF1, 0x9F, 0xD9, 0x7F, 0x33,
+ 0x68, 0x69, 0x54, 0x87, 0xF6, 0x4F, 0xC1, 0x19,
+ 0x1E, 0xE3, 0x01, 0xB2, 0x00, 0x43, 0x2E, 0x54,
+ 0xD7 },
+ { 0x39, 0x09, 0x53, 0x55, 0x67, 0x0E, 0x07, 0xDD,
+ 0xA6, 0xF8, 0x7C, 0x7F, 0x78, 0xAF, 0xE7, 0xE1,
+ 0x03, 0x6F, 0xD7, 0x53, 0x30, 0xF0, 0x71, 0x14,
+ 0xF1, 0x24, 0x14, 0x34, 0x52, 0x69, 0x0C, 0x8B,
+ 0x72, 0x5F, 0xE0, 0xD9, 0x6D, 0xE8, 0xB6, 0x13,
+ 0xE0, 0x32, 0x92, 0x58, 0xE1, 0x7A, 0x39 },
+ { 0xE5, 0xE9, 0x11, 0x38, 0x19, 0x01, 0xA9, 0x2D,
+ 0xF3, 0xCD, 0x42, 0x27, 0x1F, 0xAB, 0x33, 0xAB,
+ 0x1D, 0x93, 0x8B, 0xF6, 0x00, 0x73, 0xAC, 0x14,
+ 0x54, 0xDE, 0xA6, 0xAC, 0xBF, 0x20, 0xE6, 0xA4,
+ 0x09, 0xF7, 0xDC, 0x23, 0xF8, 0x86, 0x50, 0xEB,
+ 0x53, 0x92, 0x13, 0x73, 0x3D, 0x46, 0x1E, 0x5A },
+ { 0xD9, 0xA9, 0x50, 0xDA, 0x1D, 0xFC, 0xEE, 0x71,
+ 0xDA, 0x94, 0x1D, 0x9A, 0xB5, 0x03, 0x3E, 0xBE,
+ 0xFA, 0x1B, 0xE1, 0xF3, 0xA1, 0x32, 0xDE, 0xF4,
+ 0xC4, 0xF1, 0x67, 0x02, 0x38, 0x85, 0x5C, 0x11,
+ 0x2F, 0xAD, 0xEB, 0x4C, 0xA9, 0xD9, 0xBD, 0x84,
+ 0x6E, 0xDA, 0x1E, 0x23, 0xDE, 0x5C, 0xE1, 0xD8,
+ 0x77, 0xC3, 0xCB, 0x18, 0xF5, 0xAA, 0x0D, 0xB9,
+ 0x9B, 0x74, 0xBB, 0xD3, 0xFA, 0x18, 0xE5, 0x29 }
+};
aes_encrypt_ctx ctx;
aes_decrypt_ctx dctx;
static void init ()
{
- unsigned int i, j, r;
-
- srand(42);
- for (i = 0; i < 16; i++)
- key[i] = 0xff & rand();
- memset(test_case, 0, sizeof(test_case));
- for (i = 0; i < NTESTS; i++)
- for (j = 0; j < test_case_len[i]; j++) {
- test_case[i].input[j] = 0xff & rand();
- }
+ AES_RETURN r;
r = aes_encrypt_key128(key, &ctx);
if (r) fprintf(stderr, "error, line %d\n", __LINE__), exit(1);
@@ -232,7 +257,7 @@ cts_dec (unsigned char *out, unsigned char *in, unsigned char *iv,
static void ecb_test ()
{
unsigned int testno;
- unsigned char tmp[4*B];
+ uint8_t output[4 * B], tmp[4 * B];
printf ("ECB tests:\n");
printf ("key:");
@@ -241,14 +266,14 @@ static void ecb_test ()
unsigned len = (test_case_len[testno] + 15) & ~15;
printf ("\ntest %d - %d bytes\n", testno, len);
printf ("input:");
- hexdump (test_case[testno].input, len);
+ hexdump (test_case[testno], len);
printf ("\n");
- ecb_enc (test_case[testno].output, test_case[testno].input, len);
+ ecb_enc (output, test_case[testno], len);
printf ("output:");
- hexdump (test_case[testno].output, len);
+ hexdump (output, len);
printf ("\n");
- ecb_dec (tmp, test_case[testno].output, len);
- if (memcmp (tmp, test_case[testno].input, len)) {
+ ecb_dec (tmp, output, len);
+ if (memcmp (tmp, test_case[testno], len)) {
printf ("ecb decrypt failed!!");
hexdump (tmp, len);
printf ("\n");
@@ -263,7 +288,7 @@ unsigned char ivec[16] = { 0 };
static void cbc_test ()
{
unsigned int testno;
- unsigned char tmp[4*B];
+ uint8_t output[4 * B], tmp[4 * B];
printf ("CBC tests:\n");
printf ("initial vector:");
@@ -272,14 +297,14 @@ static void cbc_test ()
unsigned len = (test_case_len[testno] + 15) & ~15;
printf ("\ntest %d - %d bytes\n", testno, len);
printf ("input:");
- hexdump (test_case[testno].input, len);
+ hexdump (test_case[testno], len);
printf ("\n");
- cbc_enc (test_case[testno].output, test_case[testno].input, ivec, len);
+ cbc_enc (output, test_case[testno], ivec, len);
printf ("output:");
- hexdump (test_case[testno].output, len);
+ hexdump (output, len);
printf ("\n");
- cbc_dec (tmp, test_case[testno].output, ivec, len);
- if (memcmp (tmp, test_case[testno].input, len)) {
+ cbc_dec (tmp, output, ivec, len);
+ if (memcmp (tmp, test_case[testno], len)) {
printf("cbc decrypt failed!!");
hexdump (tmp, len);
printf ("\n");
@@ -292,7 +317,7 @@ static void cbc_test ()
static void cts_test ()
{
unsigned int testno;
- unsigned char tmp[4*B];
+ uint8_t output[4 * B], tmp[4 * B];
printf ("CTS tests:\n");
printf ("initial vector:");
@@ -301,14 +326,14 @@ static void cts_test ()
unsigned int len = test_case_len[testno];
printf ("\ntest %d - %d bytes\n", testno, len);
printf ("input:");
- hexdump (test_case[testno].input, len);
+ hexdump (test_case[testno], len);
printf ("\n");
- cts_enc (test_case[testno].output, test_case[testno].input, ivec, len);
+ cts_enc (output, test_case[testno], ivec, len);
printf ("output:");
- hexdump (test_case[testno].output, len);
+ hexdump (output, len);
printf ("\n");
- cts_dec (tmp, test_case[testno].output, ivec, len);
- if (memcmp (tmp, test_case[testno].input, len))
+ cts_dec (tmp, output, ivec, len);
+ if (memcmp (tmp, test_case[testno], len))
fprintf (stderr, "cts decrypt failed!!\n"), exit(1);
}
printf ("\n");
More information about the cvs-krb5
mailing list