1 files changed, 114 insertions, 14 deletions

diff --git a/test.c b/test.c
index e32fe44..947a211 100644
--- a/test.c
+++ b/test.c
@@ -1,25 +1,49 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
+
+// Enable both ECB and CBC mode. Note this can be done before including aes.h or at compile-time.
+// E.g. with GCC by using the -D flag: gcc -c aes.c -DCBC=0 -DECB=1
+#define CBC 1
+#define ECB 1
+
 #include "aes.h"
 
 static void phex(uint8_t* str);
-static void test_ECB(void);
-static void test_decrypt(void);
+static void test_encrypt_ecb(void);
+static void test_decrypt_ecb(void);
+static void test_encrypt_ecb_verbose(void);
+static void test_encrypt_cbc(void);
+static void test_decrypt_cbc(void);
+
 
 
 int main(void)
 {
-    test_ECB();
-    test_decrypt();
+    test_encrypt_cbc();
+    test_decrypt_cbc();
+    test_decrypt_ecb();
+    test_encrypt_ecb();
+    test_encrypt_ecb_verbose();
+    
     return 0;
 }
 
 
-/* Helpers */
 
-static void test_ECB(void)
+// prints string as hex
+static void phex(uint8_t* str)
+{
+    unsigned char i;
+    for(i = 0; i < 16; ++i)
+        printf("%.2x", str[i]);
+    printf("\n");
+}
+
+static void test_encrypt_ecb_verbose(void)
 {
+    // Example of more verbose verification
+
     uint8_t i, buf[64], buf2[64];
 
     // 128bit key
@@ -34,6 +58,7 @@ static void test_ECB(void)
     memset(buf2, 0, 64);
 
     // print text to encrypt, key and IV
+    printf("ECB encrypt verbose:\n\n");
     printf("plain text:\n");
     for(i = (uint8_t) 0; i < (uint8_t) 4; ++i)
     {
@@ -55,17 +80,91 @@ static void test_ECB(void)
     printf("\n");
 }
 
-// prints string as hex
-static void phex(uint8_t* str)
+
+static void test_encrypt_ecb(void)
 {
-    unsigned char i;
-    for(i = 0; i < 16; ++i)
-        printf("%.2x", str[i]);
-    printf("\n");
+  uint8_t key[] = {0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c};
+  uint8_t in[]  = {0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a};
+  uint8_t out[] = {0x3a, 0xd7, 0x7b, 0xb4, 0x0d, 0x7a, 0x36, 0x60, 0xa8, 0x9e, 0xca, 0xf3, 0x24, 0x66, 0xef, 0x97};
+  uint8_t buffer[16];
+
+  AES128_ECB_encrypt(in, key, buffer);
+
+  printf("ECB decrypt: ");
+
+  if(0 == strncmp((char*) out, (char*) buffer, 16))
+  {
+    printf("SUCCESS!\n");
+  }
+  else
+  {
+    printf("FAILURE!\n");
+  }
 }
 
+static void test_decrypt_cbc(void)
+{
+  // Example "simulating" a smaller buffer...
+
+  uint8_t key[] = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c };
+  uint8_t iv[]  = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
+  uint8_t in[]  = { 0x76, 0x49, 0xab, 0xac, 0x81, 0x19, 0xb2, 0x46, 0xce, 0xe9, 0x8e, 0x9b, 0x12, 0xe9, 0x19, 0x7d,
+                    0x50, 0x86, 0xcb, 0x9b, 0x50, 0x72, 0x19, 0xee, 0x95, 0xdb, 0x11, 0x3a, 0x91, 0x76, 0x78, 0xb2,
+                    0x73, 0xbe, 0xd6, 0xb8, 0xe3, 0xc1, 0x74, 0x3b, 0x71, 0x16, 0xe6, 0x9e, 0x22, 0x22, 0x95, 0x16, 
+                    0x3f, 0xf1, 0xca, 0xa1, 0x68, 0x1f, 0xac, 0x09, 0x12, 0x0e, 0xca, 0x30, 0x75, 0x86, 0xe1, 0xa7 };
+  uint8_t out[] = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a,
+                    0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51,
+                    0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef,
+                    0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 };
+  uint8_t buffer[64];
+
+  AES128_CBC_decrypt_buffer(buffer+0, in+0,  16, key, iv);
+  AES128_CBC_decrypt_buffer(buffer+16, in+16, 16, key, 0);
+  AES128_CBC_decrypt_buffer(buffer+32, in+32, 16, key, 0);
+  AES128_CBC_decrypt_buffer(buffer+48, in+48, 16, key, 0);
+
+  printf("CBC decrypt: ");
+
+  if(0 == strncmp((char*) out, (char*) buffer, 64))
+  {
+    printf("SUCCESS!\n");
+  }
+  else
+  {
+    printf("FAILURE!\n");
+  }
+}
 
-static void test_decrypt(void)
+static void test_encrypt_cbc(void)
+{
+  uint8_t key[] = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c };
+  uint8_t iv[]  = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
+  uint8_t in[]  = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a,
+                    0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51,
+                    0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef,
+                    0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 };
+  uint8_t out[] = { 0x76, 0x49, 0xab, 0xac, 0x81, 0x19, 0xb2, 0x46, 0xce, 0xe9, 0x8e, 0x9b, 0x12, 0xe9, 0x19, 0x7d,
+                    0x50, 0x86, 0xcb, 0x9b, 0x50, 0x72, 0x19, 0xee, 0x95, 0xdb, 0x11, 0x3a, 0x91, 0x76, 0x78, 0xb2,
+                    0x73, 0xbe, 0xd6, 0xb8, 0xe3, 0xc1, 0x74, 0x3b, 0x71, 0x16, 0xe6, 0x9e, 0x22, 0x22, 0x95, 0x16, 
+                    0x3f, 0xf1, 0xca, 0xa1, 0x68, 0x1f, 0xac, 0x09, 0x12, 0x0e, 0xca, 0x30, 0x75, 0x86, 0xe1, 0xa7 };
+  uint8_t buffer[64];
+
+  AES128_CBC_encrypt_buffer(buffer, in, 64, key, iv);
+
+  printf("CBC encrypt: ");
+
+  if(0 == strncmp((char*) out, (char*) buffer, 64))
+  {
+    printf("SUCCESS!\n");
+  }
+  else
+  {
+    printf("FAILURE!\n");
+  }
+}
+
+
+static void test_decrypt_ecb(void)
 {
   uint8_t key[] = {0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c};
   uint8_t in[]  = {0x3a, 0xd7, 0x7b, 0xb4, 0x0d, 0x7a, 0x36, 0x60, 0xa8, 0x9e, 0xca, 0xf3, 0x24, 0x66, 0xef, 0x97};
@@ -74,7 +173,7 @@ static void test_decrypt(void)
 
   AES128_ECB_decrypt(in, key, buffer);
 
-  printf("decrypt: ");
+  printf("ECB decrypt: ");
 
   if(0 == strncmp((char*) out, (char*) buffer, 16))
   {
@@ -86,3 +185,4 @@ static void test_decrypt(void)
   }
 }
 
+