GCM and CCM test support

Add code to support GCM an CCM modes in evp_test. On encrypt this
will compare the expected ciphertext and tag. On decrypt it will
compare the expected plaintext: tag comparison is done internally.

Add a simple CCM test case and convert all tests from crypto/modes/gcm128.c

diff --git a/crypto/evp/evp_test.c b/crypto/evp/evp_test.c
index 55c7cdfdccf2b75e8c82336f120b4d9b6e8138a3..52893429538d4974ee9adb5fe8d31b186c77e92a 100644 (file)
--- a/crypto/evp/evp_test.c
+++ b/crypto/evp/evp_test.c
@@ -137,11 +137,13 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
                  const unsigned char *iv,int in,
                  const unsigned char *plaintext,int pn,
                  const unsigned char *ciphertext,int cn,
+                 const unsigned char *aad,int an,
+                 const unsigned char *tag,int tn,
                  int encdec)
     {
     EVP_CIPHER_CTX ctx;
     unsigned char out[4096];
-    int outl,outl2;
+    int outl,outl2,mode;
 
     printf("Testing cipher %s%s\n",EVP_CIPHER_name(c),
           (encdec == 1 ? "(encrypt)" : (encdec == 0 ? "(decrypt)" : "(encrypt/decrypt)")));
@@ -150,17 +152,87 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
        hexdump(stdout,"IV",iv,in);
     hexdump(stdout,"Plaintext",plaintext,pn);
     hexdump(stdout,"Ciphertext",ciphertext,cn);
-    
-    if(kn != c->key_len)
+    if (an)
+       hexdump(stdout,"AAD",aad,an);
+    if (tn)
+       hexdump(stdout,"Tag",tag,tn);
+    mode = EVP_CIPHER_mode(c); 
+    if(kn != EVP_CIPHER_key_length(c))
        {
        fprintf(stderr,"Key length doesn't match, got %d expected %lu\n",kn,
-               (unsigned long)c->key_len);
+               (unsigned long)EVP_CIPHER_key_length(c));
        test1_exit(5);
        }
     EVP_CIPHER_CTX_init(&ctx);
     if (encdec != 0)
         {
-       if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv))
+       if (mode == EVP_CIPH_GCM_MODE)
+           {
+           if(!EVP_EncryptInit_ex(&ctx,c,NULL,NULL,NULL))
+               {
+               fprintf(stderr,"EncryptInit failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(10);
+               }
+           if(!EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_SET_IVLEN, in, NULL))
+               {
+               fprintf(stderr,"IV length set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(11);
+               }
+           if(!EVP_EncryptInit_ex(&ctx,NULL,NULL,key,iv))
+               {
+               fprintf(stderr,"Key/IV set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(12);
+               }
+           if (an && !EVP_EncryptUpdate(&ctx,NULL,&outl,aad,an))
+               {
+               fprintf(stderr,"AAD set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(13);
+               }
+           }
+       else if (mode == EVP_CIPH_CCM_MODE)
+           {
+           if(!EVP_EncryptInit_ex(&ctx,c,NULL,NULL,NULL))
+               {
+               fprintf(stderr,"EncryptInit failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(10);
+               }
+           if(!EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_CCM_SET_IVLEN, in, NULL))
+               {
+               fprintf(stderr,"IV length set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(11);
+               }
+           if(!EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_CCM_SET_TAG, tn, NULL))
+               {
+               fprintf(stderr,"Tag length set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(11);
+               }
+           if(!EVP_EncryptInit_ex(&ctx,NULL,NULL,key,iv))
+               {
+               fprintf(stderr,"Key/IV set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(12);
+               }
+           if (!EVP_EncryptUpdate(&ctx,NULL,&outl,NULL,pn))
+               {
+               fprintf(stderr,"Plaintext length set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(12);
+               }
+           if (an && !EVP_EncryptUpdate(&ctx,NULL,&outl,aad,an))
+               {
+               fprintf(stderr,"AAD set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(13);
+               }
+           }
+       else if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv))
            {
            fprintf(stderr,"EncryptInit failed\n");
            ERR_print_errors_fp(stderr);
@@ -195,11 +267,103 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
            hexdump(stderr,"Expected",ciphertext,cn);
            test1_exit(9);
            }
+       if (mode == EVP_CIPH_GCM_MODE || mode == EVP_CIPH_CCM_MODE)
+           {
+           unsigned char rtag[16];
+           /* Note: EVP_CTRL_CCM_GET_TAG has same value as 
+            * EVP_CTRL_GCM_GET_TAG
+            */
+           if (!EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_GET_TAG, tn, rtag))
+               {
+               fprintf(stderr,"Get tag failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(14);
+               }
+           if (memcmp(rtag, tag, tn))
+               {
+               fprintf(stderr,"Tag mismatch\n");
+               hexdump(stderr,"Got",rtag,tn);
+               hexdump(stderr,"Expected",tag,tn);
+               test1_exit(9);
+               }
+           }
        }
 
     if (encdec <= 0)
         {
-       if(!EVP_DecryptInit_ex(&ctx,c,NULL,key,iv))
+       if (mode == EVP_CIPH_GCM_MODE)
+           {
+           if(!EVP_DecryptInit_ex(&ctx,c,NULL,NULL,NULL))
+               {
+               fprintf(stderr,"EncryptInit failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(10);
+               }
+           if(!EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_SET_IVLEN, in, NULL))
+               {
+               fprintf(stderr,"IV length set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(11);
+               }
+           if(!EVP_DecryptInit_ex(&ctx,NULL,NULL,key,iv))
+               {
+               fprintf(stderr,"Key/IV set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(12);
+               }
+           if (!EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_SET_TAG, tn, (void *)tag))
+               {
+               fprintf(stderr,"Set tag failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(14);
+               }
+           if (an && !EVP_DecryptUpdate(&ctx,NULL,&outl,aad,an))
+               {
+               fprintf(stderr,"AAD set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(13);
+               }
+           }
+       else if (mode == EVP_CIPH_CCM_MODE)
+           {
+           if(!EVP_DecryptInit_ex(&ctx,c,NULL,NULL,NULL))
+               {
+               fprintf(stderr,"DecryptInit failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(10);
+               }
+           if(!EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_CCM_SET_IVLEN, in, NULL))
+               {
+               fprintf(stderr,"IV length set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(11);
+               }
+           if(!EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_CCM_SET_TAG, tn, (void *)tag))
+               {
+               fprintf(stderr,"Tag length set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(11);
+               }
+           if(!EVP_DecryptInit_ex(&ctx,NULL,NULL,key,iv))
+               {
+               fprintf(stderr,"Key/Nonce set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(12);
+               }
+           if (!EVP_DecryptUpdate(&ctx,NULL,&outl,NULL,pn))
+               {
+               fprintf(stderr,"Plaintext length set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(12);
+               }
+           if (an && !EVP_EncryptUpdate(&ctx,NULL,&outl,aad,an))
+               {
+               fprintf(stderr,"AAD set failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(13);
+               }
+           }
+       else if(!EVP_DecryptInit_ex(&ctx,c,NULL,key,iv))
            {
            fprintf(stderr,"DecryptInit failed\n");
            ERR_print_errors_fp(stderr);
@@ -213,7 +377,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
            ERR_print_errors_fp(stderr);
            test1_exit(6);
            }
-       if(!EVP_DecryptFinal_ex(&ctx,out+outl,&outl2))
+       if(mode != EVP_CIPH_CCM_MODE && !EVP_DecryptFinal_ex(&ctx,out+outl,&outl2))
            {
            fprintf(stderr,"DecryptFinal failed\n");
            ERR_print_errors_fp(stderr);
@@ -245,6 +409,8 @@ static int test_cipher(const char *cipher,const unsigned char *key,int kn,
                       const unsigned char *iv,int in,
                       const unsigned char *plaintext,int pn,
                       const unsigned char *ciphertext,int cn,
+                      const unsigned char *aad,int an,
+                      const unsigned char *tag,int tn,
                       int encdec)
     {
     const EVP_CIPHER *c;
@@ -253,7 +419,7 @@ static int test_cipher(const char *cipher,const unsigned char *key,int kn,
     if(!c)
        return 0;
 
-    test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec);
+    test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn,aad,an,tag,tn,encdec);
 
     return 1;
     }
@@ -366,9 +532,9 @@ int main(int argc,char **argv)
        char line[4096];
        char *p;
        char *cipher;
-       unsigned char *iv,*key,*plaintext,*ciphertext;
+       unsigned char *iv,*key,*plaintext,*ciphertext,*aad,*tag;
        int encdec;
-       int kn,in,pn,cn;
+       int kn,in,pn,cn,an,tn;
 
        if(!fgets((char *)line,sizeof line,f))
            break;
@@ -381,19 +547,35 @@ int main(int argc,char **argv)
        plaintext=ustrsep(&p,":");
        ciphertext=ustrsep(&p,":");
        if (p[-1] == '\n') {
-           p[-1] = '\0';
            encdec = -1;
+           p[-1] = '\0';
+           tag=aad=NULL;
+           an=tn=0;
        } else {
-           encdec = atoi(sstrsep(&p,"\n"));
+           aad=ustrsep(&p,":");
+           tag=ustrsep(&p,":");
+           if (tag == NULL) {
+               p = (char *)aad;
+               tag=aad=NULL;
+               an=tn=0;
+           }
+           if (p [-1] == '\n') {
+               encdec = -1;
+               p[-1] = '\0';
+           } else
+               encdec = atoi(sstrsep(&p,"\n"));
        }
-             
 
        kn=convert(key);
        in=convert(iv);
        pn=convert(plaintext);
        cn=convert(ciphertext);
+       if (aad) {
+           an=convert(aad);
+           tn=convert(tag);
+       }
 
-       if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec)
+       if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn,aad,an,tag,tn,encdec)
           && !test_digest(cipher,plaintext,pn,ciphertext,cn))
            {
 #ifdef OPENSSL_NO_AES

diff --git a/crypto/evp/evptests.txt b/crypto/evp/evptests.txt
index c273707c1444f59b70cfca6ece95834a3d5c5676..fe1d1e585f7683904dea1dce3c1b5eccb3f6d273 100644 (file)
--- a/crypto/evp/evptests.txt
+++ b/crypto/evp/evptests.txt
@@ -1,4 +1,5 @@
 #cipher:key:iv:plaintext:ciphertext:0/1(decrypt/encrypt)
+#aadcipher:key:iv:plaintext:ciphertext:aad:tag:0/1(decrypt/encrypt)
 #digest:::input:output
 
 # SHA(1) tests (from shatest.c)
@@ -332,3 +333,25 @@ SEED-ECB:00000000000000000000000000000000::000102030405060708090A0B0C0D0E0F:5EBA
 SEED-ECB:000102030405060708090A0B0C0D0E0F::00000000000000000000000000000000:C11F22F20140505084483597E4370F43:1
 SEED-ECB:4706480851E61BE85D74BFB3FD956185::83A2F8A288641FB9A4E9A5CC2F131C7D:EE54D13EBCAE706D226BC3142CD40D4A:1
 SEED-ECB:28DBC3BC49FFD87DCFA509B11D422BE7::B41E6BE2EBA84A148E2EED84593C5EC7:9B9B7BFCD1813CB95D0B3618F40F5122:1
+# AES CCM 256 bit key
+aes-256-ccm:1bde3251d41a8b5ea013c195ae128b218b3e0306376357077ef1c1c78548b92e:5b8e40746f6b98e00f1d13ff41:53bd72a97089e312422bf72e242377b3c6ee3e2075389b999c4ef7f28bd2b80a:9a5fcccdb4cf04e7293d2775cc76a488f042382d949b43b7d6bb2b9864786726:c17a32514eb6103f3249e076d4c871dc97e04b286699e54491dc18f6d734d4c0:2024931d73bca480c24a24ece6b6c2bf
+# AES GCM tests
+aes-128-gcm:00000000000000000000000000000000:000000000000000000000000::::58e2fccefa7e3061367f1d57a4e7455a
+aes-128-gcm:00000000000000000000000000000000:000000000000000000000000:00000000000000000000000000000000:0388dace60b6a392f328c2b971b2fe78::ab6e47d42cec13bdf53a67b21257bddf
+aes-128-gcm:feffe9928665731c6d6a8f9467308308:cafebabefacedbaddecaf888:d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255:42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f5985::4d5c2af327cd64a62cf35abd2ba6fab4
+aes-128-gcm:feffe9928665731c6d6a8f9467308308:cafebabefacedbaddecaf888:d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39:42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091:feedfacedeadbeeffeedfacedeadbeefabaddad2:5bc94fbc3221a5db94fae95ae7121a47
+aes-128-gcm:feffe9928665731c6d6a8f9467308308:cafebabefacedbad:d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39:61353b4c2806934a777ff51fa22a4755699b2a714fcdc6f83766e5f97b6c742373806900e49f24b22b097544d4896b424989b5e1ebac0f07c23f4598:feedfacedeadbeeffeedfacedeadbeefabaddad2:3612d2e79e3b0785561be14aaca2fccb
+aes-128-gcm:feffe9928665731c6d6a8f9467308308:9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b:d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39:8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca701e4a9a4fba43c90ccdcb281d48c7c6fd62875d2aca417034c34aee5:feedfacedeadbeeffeedfacedeadbeefabaddad2:619cc5aefffe0bfa462af43c1699d050
+aes-192-gcm:000000000000000000000000000000000000000000000000:000000000000000000000000::::cd33b28ac773f74ba00ed1f312572435
+aes-192-gcm:000000000000000000000000000000000000000000000000:000000000000000000000000:00000000000000000000000000000000:98e7247c07f0fe411c267e4384b0f600::2ff58d80033927ab8ef4d4587514f0fb
+aes-192-gcm:feffe9928665731c6d6a8f9467308308feffe9928665731c:cafebabefacedbaddecaf888:d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255:3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710acade256::9924a7c8587336bfb118024db8674a14
+aes-192-gcm:feffe9928665731c6d6a8f9467308308feffe9928665731c:cafebabefacedbaddecaf888:d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39:3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710:feedfacedeadbeeffeedfacedeadbeefabaddad2:2519498e80f1478f37ba55bd6d27618c
+aes-192-gcm:feffe9928665731c6d6a8f9467308308feffe9928665731c:cafebabefacedbad:d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39:0f10f599ae14a154ed24b36e25324db8c566632ef2bbb34f8347280fc4507057fddc29df9a471f75c66541d4d4dad1c9e93a19a58e8b473fa0f062f7:feedfacedeadbeeffeedfacedeadbeefabaddad2:65dcc57fcf623a24094fcca40d3533f8
+aes-192-gcm:feffe9928665731c6d6a8f9467308308feffe9928665731c:9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b:d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39:d27e88681ce3243c4830165a8fdcf9ff1de9a1d8e6b447ef6ef7b79828666e4581e79012af34ddd9e2f037589b292db3e67c036745fa22e7e9b7373b:feedfacedeadbeeffeedfacedeadbeefabaddad2:dcf566ff291c25bbb8568fc3d376a6d9
+aes-256-gcm:0000000000000000000000000000000000000000000000000000000000000000:000000000000000000000000::::530f8afbc74536b9a963b4f1c4cb738b
+aes-256-gcm:0000000000000000000000000000000000000000000000000000000000000000:000000000000000000000000:00000000000000000000000000000000:cea7403d4d606b6e074ec5d3baf39d18::d0d1c8a799996bf0265b98b5d48ab919
+aes-256-gcm:feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308:cafebabefacedbaddecaf888:d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255:522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad::b094dac5d93471bdec1a502270e3cc6c
+aes-256-gcm:feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308:cafebabefacedbaddecaf888:d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39:522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662:feedfacedeadbeeffeedfacedeadbeefabaddad2:76fc6ece0f4e1768cddf8853bb2d551b
+aes-256-gcm:feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308:cafebabefacedbad:d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39:c3762df1ca787d32ae47c13bf19844cbaf1ae14d0b976afac52ff7d79bba9de0feb582d33934a4f0954cc2363bc73f7862ac430e64abe499f47c9b1f:feedfacedeadbeeffeedfacedeadbeefabaddad2:3a337dbf46a792c45e454913fe2ea8f2
+aes-256-gcm:feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308:9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b:d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39:5a8def2f0c9e53f1f75d7853659e2a20eeb2b22aafde6419a058ab4f6f746bf40fc0c3b780f244452da3ebf1c5d82cdea2418997200ef82e44ae7e3f:feedfacedeadbeeffeedfacedeadbeefabaddad2:a44a8266ee1c8eb0c8b5d4cf5ae9f19a
+aes-128-gcm:00000000000000000000000000000000:000000000000000000000000:::d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad:5fea793a2d6f974d37e68e0cb8ff9492