modify demo to use multiple test vectors

Author: ilvn

demo.c

@@ -2,7 +2,7 @@
 *   Byte-oriented AES-256 implementation.
 *   All lookup tables replaced with 'on the fly' calculations.
 *
-*   Copyright (c) 2007 Ilya O. Levin, http://www.literatecode.com
+*   Copyright (c) 2007, 2022 Ilia Levin (ilia@levin.sg)
 *
 *   Permission to use, copy, modify, and distribute this software for any
 *   purpose with or without fee is hereby granted, provided that the above
@@ -16,45 +16,112 @@
 *   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 *   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
-#include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "aes256.h"
 
-#define DUMP(s, i, buf, sz)  {printf(s);                   \
-        for (i = 0; i < (sz);i++)    \
-            printf("%02x ", buf[i]); \
-        printf("\n");}
+/*
+*   AES tests from FIPS-197 Appendix C.3, NIST documents SP800-38A and AESAVS
+*/
+
+static struct {
+    uint8_t key[32];
+    uint8_t pt[16];
+    uint8_t ct[16];
+} test[] = {
+    {
+        .key = {
+            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+            0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
+        },
+        .pt = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff},
+        .ct = {0x8e, 0xa2, 0xb7, 0xca, 0x51, 0x67, 0x45, 0xbf, 0xea, 0xfc, 0x49, 0x90, 0x4b, 0x49, 0x60, 0x89},
+    },
+    {
+        .key = {
+            0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE, 0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
+            0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7, 0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4
+        },
+        .pt = {0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96, 0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A},
+        .ct = {0xF3, 0xEE, 0xD1, 0xBD, 0xB5, 0xD2, 0xA0, 0x3C, 0x06, 0x4B, 0x5A, 0x7E, 0x3D, 0xB1, 0x81, 0xF8},
+    },
+    {
+        .key = {
+            0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE, 0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
+            0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7, 0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4
+        },
+        .pt = {0xAE, 0x2D, 0x8A, 0x57, 0x1E, 0x03, 0xAC, 0x9C, 0x9E, 0xB7, 0x6F, 0xAC, 0x45, 0xAF, 0x8E, 0x51},
+        .ct = {0x59, 0x1C, 0xCB, 0x10, 0xD4, 0x10, 0xED, 0x26, 0xDC, 0x5B, 0xA7, 0x4A, 0x31, 0x36, 0x28, 0x70},
+    },
+    {
+        .key = {
+            0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE, 0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
+            0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7, 0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4
+        },
+        .pt = {0x30, 0xC8, 0x1C, 0x46, 0xA3, 0x5C, 0xE4, 0x11, 0xE5, 0xFB, 0xC1, 0x19, 0x1A, 0x0A, 0x52, 0xEF},
+        .ct = {0xB6, 0xED, 0x21, 0xB9, 0x9C, 0xA6, 0xF4, 0xF9, 0xF1, 0x53, 0xE7, 0xB1, 0xBE, 0xAF, 0xED, 0x1D},
+    },
+    {
+        .key = {
+            0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE, 0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
+            0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7, 0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4
+        },
+        .pt = {0xF6, 0x9F, 0x24, 0x45, 0xDF, 0x4F, 0x9B, 0x17, 0xAD, 0x2B, 0x41, 0x7B, 0xE6, 0x6C, 0x37, 0x10},
+        .ct = {0x23, 0x30, 0x4B, 0x7A, 0x39, 0xF9, 0xF3, 0xFF, 0x06, 0x7D, 0x8D, 0x8F, 0x9E, 0x24, 0xEC, 0xC7},
+    },
+    {
+        .key = {
+            0xc4, 0x7b, 0x02, 0x94, 0xdb, 0xbb, 0xee, 0x0f, 0xec, 0x47, 0x57, 0xf2, 0x2f, 0xfe, 0xee, 0x35,
+            0x87, 0xca, 0x47, 0x30, 0xc3, 0xd3, 0x3b, 0x69, 0x1d, 0xf3, 0x8b, 0xab, 0x07, 0x6b, 0xc5, 0x58
+        },
+        .pt = {0},
+        .ct = {0x46, 0xf2, 0xfb, 0x34, 0x2d, 0x6f, 0x0a, 0xb4, 0x77, 0x47, 0x6f, 0xc5, 0x01, 0x24, 0x2c, 0x5f},
+    },
+    {
+        .key = {
+            0xfc, 0xa0, 0x2f, 0x3d, 0x50, 0x11, 0xcf, 0xc5, 0xc1, 0xe2, 0x31, 0x65, 0xd4, 0x13, 0xa0, 0x49,
+            0xd4, 0x52, 0x6a, 0x99, 0x18, 0x27, 0x42, 0x4d, 0x89, 0x6f, 0xe3, 0x43, 0x5e, 0x0b, 0xf6, 0x8e
+        },
+        .pt = {0},
+        .ct = {0x17, 0x9a, 0x49, 0xc7, 0x12, 0x15, 0x4b, 0xbf, 0xfb, 0xe6, 0xe7, 0xa8, 0x4a, 0x18, 0xe2, 0x20},
+    },
+    {
+        .key = {
+            0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        .pt = {0},
+        .ct = {0x9c, 0xf4, 0x89, 0x3e, 0xca, 0xfa, 0x0a, 0x02, 0x47, 0xa8, 0x98, 0xe0, 0x40, 0x69, 0x15, 0x59},
+    },
+};
+
+static const uint8_t total_tests = 0x7f & (sizeof(test) / sizeof(test[0]));
+
 
 int
 main(void)
 {
     aes256_context ctx;
-    uint8_t key[32];
-    uint8_t buf[16], i;
-
-    /* put a test vector */
-    for (i = 0; i < sizeof(buf); i++) {
-        buf[i] = i * 16 + i;
-    }
-    for (i = 0; i < sizeof(key); i++) {
-        key[i] = i;
-    }
-
-    DUMP("txt: ", i, buf, sizeof(buf));
-    DUMP("key: ", i, key, sizeof(key));
-    printf("---\n");
+    uint8_t buf[16];
+    uint8_t n;
 
-    aes256_init(&ctx, key);
-    aes256_encrypt_ecb(&ctx, buf);
+    for (n = 0; n < total_tests; n++) {
+        aes256_init(&ctx, test[n].key);
+        memcpy(buf, test[n].pt, sizeof(buf));
 
-    DUMP("enc: ", i, buf, sizeof(buf));
-    printf("tst: 8e a2 b7 ca 51 67 45 bf ea fc 49 90 4b 49 60 89\n");
+        aes256_encrypt_ecb(&ctx, buf);
+        if (0 != memcmp(buf, test[n].ct, sizeof(buf))) {
+            return printf("FAILED (case %d/encrypt)\n", n);
+        }
 
-    aes256_init(&ctx, key);
-    aes256_decrypt_ecb(&ctx, buf);
-    DUMP("dec: ", i, buf, sizeof(buf));
+        aes256_decrypt_ecb(&ctx, buf);
+        if (0 != memcmp(buf, test[n].pt, sizeof(buf))) {
+            return printf("FAILED (case %d/decrypt)\n", n);
+        }
 
-    aes256_done(&ctx);
+        aes256_done(&ctx);
+    }
 
+    printf("Success\n");
     return 0;
 } /* main */