Dead code cleanup: #if 0 dropped from tests
[openssl.git] / crypto / evp / evp_test.c
index e723265acebefcec5d200b38ce708907a0a1bf2d..ea332ae34b7f11b7dc32efce740989be7d6ad5e2 100644 (file)
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
 #include <openssl/opensslconf.h>
 #include <openssl/evp.h>
 #ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
+# include <openssl/engine.h>
 #endif
 #include <openssl/err.h>
 #include <openssl/conf.h>
 
-static void hexdump(FILE *f,const char *title,const unsigned char *s,int l)
-    {
-    int n=0;
-
-    fprintf(f,"%s",title);
-    for( ; n < l ; ++n)
-       {
-       if((n%16) == 0)
-           fprintf(f,"\n%04x",n);
-       fprintf(f," %02x",s[n]);
-       }
-    fprintf(f,"\n");
+static void hexdump(FILE *f, const char *title, const unsigned char *s, int l)
+{
+    int n = 0;
+
+    fprintf(f, "%s", title);
+    for (; n < l; ++n) {
+        if ((n % 16) == 0)
+            fprintf(f, "\n%04x", n);
+        fprintf(f, " %02x", s[n]);
     }
+    fprintf(f, "\n");
+}
 
 static int convert(unsigned char *s)
-    {
+{
     unsigned char *d;
 
-    for(d=s ; *s ; s+=2,++d)
-       {
-       unsigned int n;
-
-       if(!s[1])
-           {
-           fprintf(stderr,"Odd number of hex digits!");
-           EXIT(4);
-           }
-       sscanf((char *)s,"%2x",&n);
-       *d=(unsigned char)n;
-       }
-    return s-d;
+    for (d = s; *s; s += 2, ++d) {
+        unsigned int n;
+
+        if (!s[1]) {
+            fprintf(stderr, "Odd number of hex digits!");
+            EXIT(4);
+        }
+        sscanf((char *)s, "%2x", &n);
+        *d = (unsigned char)n;
     }
+    return s - d;
+}
 
 static char *sstrsep(char **string, const char *delim)
-    {
+{
     char isdelim[256];
     char *token = *string;
 
@@ -104,242 +101,378 @@ static char *sstrsep(char **string, const char *delim)
     memset(isdelim, 0, 256);
     isdelim[0] = 1;
 
-    while (*delim)
-        {
+    while (*delim) {
         isdelim[(unsigned char)(*delim)] = 1;
         delim++;
-        }
+    }
 
-    while (!isdelim[(unsigned char)(**string)])
-        {
+    while (!isdelim[(unsigned char)(**string)]) {
         (*string)++;
-        }
+    }
 
-    if (**string)
-        {
+    if (**string) {
         **string = 0;
         (*string)++;
-        }
+    }
 
     return token;
-    }
+}
 
-static unsigned char *ustrsep(char **p,const char *sep)
-    { return (unsigned char *)sstrsep(p,sep); }
+static unsigned char *ustrsep(char **p, const char *sep)
+{
+    return (unsigned char *)sstrsep(p, sep);
+}
 
 static int test1_exit(int ec)
-       {
-       EXIT(ec);
-       return(0);              /* To keep some compilers quiet */
-       }
-
-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,
-                 int encdec)
-    {
-    EVP_CIPHER_CTX ctx;
+{
+    EXIT(ec);
+}
+
+/* Test copying of contexts */
+static void test_ctx_replace(EVP_CIPHER_CTX **pctx)
+{
+    /* Make copy of context and replace original */
+    EVP_CIPHER_CTX *ctx_copy;
+    ctx_copy = EVP_CIPHER_CTX_new();
+    EVP_CIPHER_CTX_copy(ctx_copy, *pctx);
+    EVP_CIPHER_CTX_free(*pctx);
+    *pctx = ctx_copy;
+}
+
+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 = NULL;
     unsigned char out[4096];
-    int outl,outl2;
-
-    printf("Testing cipher %s%s\n",EVP_CIPHER_name(c),
-          (encdec == 1 ? "(encrypt)" : (encdec == 0 ? "(decrypt)" : "(encrypt/decrypt)")));
-    hexdump(stdout,"Key",key,kn);
-    if(in)
-       hexdump(stdout,"IV",iv,in);
-    hexdump(stdout,"Plaintext",plaintext,pn);
-    hexdump(stdout,"Ciphertext",ciphertext,cn);
-    
-    if(kn != c->key_len)
-       {
-       fprintf(stderr,"Key length doesn't match, got %d expected %lu\n",kn,
-               (unsigned long)c->key_len);
-       test1_exit(5);
-       }
-    EVP_CIPHER_CTX_init(&ctx);
-    if (encdec != 0)
-        {
-       if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv))
-           {
-           fprintf(stderr,"EncryptInit failed\n");
-           ERR_print_errors_fp(stderr);
-           test1_exit(10);
-           }
-       EVP_CIPHER_CTX_set_padding(&ctx,0);
-
-       if(!EVP_EncryptUpdate(&ctx,out,&outl,plaintext,pn))
-           {
-           fprintf(stderr,"Encrypt failed\n");
-           ERR_print_errors_fp(stderr);
-           test1_exit(6);
-           }
-       if(!EVP_EncryptFinal_ex(&ctx,out+outl,&outl2))
-           {
-           fprintf(stderr,"EncryptFinal failed\n");
-           ERR_print_errors_fp(stderr);
-           test1_exit(7);
-           }
-
-       if(outl+outl2 != cn)
-           {
-           fprintf(stderr,"Ciphertext length mismatch got %d expected %d\n",
-                   outl+outl2,cn);
-           test1_exit(8);
-           }
-
-       if(memcmp(out,ciphertext,cn))
-           {
-           fprintf(stderr,"Ciphertext mismatch\n");
-           hexdump(stderr,"Got",out,cn);
-           hexdump(stderr,"Expected",ciphertext,cn);
-           test1_exit(9);
-           }
-       }
-
-    if (encdec <= 0)
-        {
-       if(!EVP_DecryptInit_ex(&ctx,c,NULL,key,iv))
-           {
-           fprintf(stderr,"DecryptInit failed\n");
-           ERR_print_errors_fp(stderr);
-           test1_exit(11);
-           }
-       EVP_CIPHER_CTX_set_padding(&ctx,0);
-
-       if(!EVP_DecryptUpdate(&ctx,out,&outl,ciphertext,cn))
-           {
-           fprintf(stderr,"Decrypt failed\n");
-           ERR_print_errors_fp(stderr);
-           test1_exit(6);
-           }
-       if(!EVP_DecryptFinal_ex(&ctx,out+outl,&outl2))
-           {
-           fprintf(stderr,"DecryptFinal failed\n");
-           ERR_print_errors_fp(stderr);
-           test1_exit(7);
-           }
-
-       if(outl+outl2 != cn)
-           {
-           fprintf(stderr,"Plaintext length mismatch got %d expected %d\n",
-                   outl+outl2,cn);
-           test1_exit(8);
-           }
-
-       if(memcmp(out,plaintext,cn))
-           {
-           fprintf(stderr,"Plaintext mismatch\n");
-           hexdump(stderr,"Got",out,cn);
-           hexdump(stderr,"Expected",plaintext,cn);
-           test1_exit(9);
-           }
-       }
-
-    EVP_CIPHER_CTX_cleanup(&ctx);
+    int outl, outl2, mode;
+
+    printf("Testing cipher %s%s\n", EVP_CIPHER_name(c),
+           (encdec ==
+            1 ? "(encrypt)" : (encdec ==
+                               0 ? "(decrypt)" : "(encrypt/decrypt)")));
+    hexdump(stdout, "Key", key, kn);
+    if (in)
+        hexdump(stdout, "IV", iv, in);
+    hexdump(stdout, "Plaintext", plaintext, pn);
+    hexdump(stdout, "Ciphertext", ciphertext, cn);
+    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)EVP_CIPHER_key_length(c));
+        test1_exit(5);
+    }
+    ctx = EVP_CIPHER_CTX_new();
+    EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPHER_CTX_FLAG_WRAP_ALLOW);
+    if (encdec != 0) {
+        if ((mode == EVP_CIPH_GCM_MODE) || (mode == EVP_CIPH_OCB_MODE)
+            || (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_AEAD_SET_IVLEN, in, NULL)) {
+                fprintf(stderr, "IV length set failed\n");
+                ERR_print_errors_fp(stderr);
+                test1_exit(11);
+            }
+            if ((mode != EVP_CIPH_GCM_MODE) &&
+                !EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tn, NULL)) {
+                fprintf(stderr, "Tag length set failed\n");
+                ERR_print_errors_fp(stderr);
+                test1_exit(15);
+            }
+            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 ((mode == EVP_CIPH_CCM_MODE) &&
+                !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 (mode == EVP_CIPH_WRAP_MODE) {
+            if (!EVP_EncryptInit_ex(ctx, c, NULL, key, in ? iv : NULL)) {
+                fprintf(stderr, "EncryptInit failed\n");
+                ERR_print_errors_fp(stderr);
+                test1_exit(10);
+            }
+        } else if (!EVP_EncryptInit_ex(ctx, c, NULL, key, iv)) {
+            fprintf(stderr, "EncryptInit failed\n");
+            ERR_print_errors_fp(stderr);
+            test1_exit(10);
+        }
+        EVP_CIPHER_CTX_set_padding(ctx, 0);
 
-    printf("\n");
+        test_ctx_replace(&ctx);
+
+        if (!EVP_EncryptUpdate(ctx, out, &outl, plaintext, pn)) {
+            fprintf(stderr, "Encrypt failed\n");
+            ERR_print_errors_fp(stderr);
+            test1_exit(6);
+        }
+        if (!EVP_EncryptFinal_ex(ctx, out + outl, &outl2)) {
+            fprintf(stderr, "EncryptFinal failed\n");
+            ERR_print_errors_fp(stderr);
+            test1_exit(7);
+        }
+
+        if (outl + outl2 != cn) {
+            fprintf(stderr, "Ciphertext length mismatch got %d expected %d\n",
+                    outl + outl2, cn);
+            test1_exit(8);
+        }
+
+        if (memcmp(out, ciphertext, cn)) {
+            fprintf(stderr, "Ciphertext mismatch\n");
+            hexdump(stderr, "Got", out, cn);
+            hexdump(stderr, "Expected", ciphertext, cn);
+            test1_exit(9);
+        }
+        if ((mode == EVP_CIPH_GCM_MODE) || (mode == EVP_CIPH_OCB_MODE)
+            || (mode == EVP_CIPH_CCM_MODE)) {
+            unsigned char rtag[16];
+
+            if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_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);
+            }
+        }
     }
 
-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,
-                      int encdec)
-    {
+    if (encdec <= 0) {
+        if ((mode == EVP_CIPH_GCM_MODE) || (mode == EVP_CIPH_OCB_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_AEAD_SET_IVLEN, in, NULL)) {
+                fprintf(stderr, "IV length set failed\n");
+                ERR_print_errors_fp(stderr);
+                test1_exit(11);
+            }
+            if ((mode == EVP_CIPH_OCB_MODE) &&
+                !EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tn, NULL)) {
+                fprintf(stderr, "Tag length set failed\n");
+                ERR_print_errors_fp(stderr);
+                test1_exit(15);
+            }
+            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_AEAD_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_AEAD_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_AEAD_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 (mode == EVP_CIPH_WRAP_MODE) {
+            if (!EVP_DecryptInit_ex(ctx, c, NULL, key, in ? iv : NULL)) {
+                fprintf(stderr, "EncryptInit failed\n");
+                ERR_print_errors_fp(stderr);
+                test1_exit(10);
+            }
+        } else if (!EVP_DecryptInit_ex(ctx, c, NULL, key, iv)) {
+            fprintf(stderr, "DecryptInit failed\n");
+            ERR_print_errors_fp(stderr);
+            test1_exit(11);
+        }
+        EVP_CIPHER_CTX_set_padding(ctx, 0);
+
+        test_ctx_replace(&ctx);
+
+        if (!EVP_DecryptUpdate(ctx, out, &outl, ciphertext, cn)) {
+            fprintf(stderr, "Decrypt failed\n");
+            ERR_print_errors_fp(stderr);
+            test1_exit(6);
+        }
+        if (mode != EVP_CIPH_CCM_MODE
+            && !EVP_DecryptFinal_ex(ctx, out + outl, &outl2)) {
+            fprintf(stderr, "DecryptFinal failed\n");
+            ERR_print_errors_fp(stderr);
+            test1_exit(7);
+        }
+
+        if (outl + outl2 != pn) {
+            fprintf(stderr, "Plaintext length mismatch got %d expected %d\n",
+                    outl + outl2, pn);
+            test1_exit(8);
+        }
+
+        if (memcmp(out, plaintext, pn)) {
+            fprintf(stderr, "Plaintext mismatch\n");
+            hexdump(stderr, "Got", out, pn);
+            hexdump(stderr, "Expected", plaintext, pn);
+            test1_exit(9);
+        }
+    }
+
+    EVP_CIPHER_CTX_free(ctx);
+
+    printf("\n");
+}
+
+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;
 
-    c=EVP_get_cipherbyname(cipher);
-    if(!c)
-       return 0;
+#ifdef OPENSSL_NO_OCB
+    if (strstr(cipher, "ocb") != NULL)
+        return 1;
+#endif
+    c = EVP_get_cipherbyname(cipher);
+    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;
-    }
+}
 
 static int test_digest(const char *digest,
-                      const unsigned char *plaintext,int pn,
-                      const unsigned char *ciphertext, unsigned int cn)
-    {
+                       const unsigned char *plaintext, int pn,
+                       const unsigned char *ciphertext, unsigned int cn)
+{
     const EVP_MD *d;
     EVP_MD_CTX ctx;
     unsigned char md[EVP_MAX_MD_SIZE];
     unsigned int mdn;
 
-    d=EVP_get_digestbyname(digest);
-    if(!d)
-       return 0;
+    d = EVP_get_digestbyname(digest);
+    if (!d)
+        return 0;
 
-    printf("Testing digest %s\n",EVP_MD_name(d));
-    hexdump(stdout,"Plaintext",plaintext,pn);
-    hexdump(stdout,"Digest",ciphertext,cn);
+    printf("Testing digest %s\n", EVP_MD_name(d));
+    hexdump(stdout, "Plaintext", plaintext, pn);
+    hexdump(stdout, "Digest", ciphertext, cn);
 
     EVP_MD_CTX_init(&ctx);
-    if(!EVP_DigestInit_ex(&ctx,d, NULL))
-       {
-       fprintf(stderr,"DigestInit failed\n");
-       ERR_print_errors_fp(stderr);
-       EXIT(100);
-       }
-    if(!EVP_DigestUpdate(&ctx,plaintext,pn))
-       {
-       fprintf(stderr,"DigestUpdate failed\n");
-       ERR_print_errors_fp(stderr);
-       EXIT(101);
-       }
-    if(!EVP_DigestFinal_ex(&ctx,md,&mdn))
-       {
-       fprintf(stderr,"DigestFinal failed\n");
-       ERR_print_errors_fp(stderr);
-       EXIT(101);
-       }
+    if (!EVP_DigestInit_ex(&ctx, d, NULL)) {
+        fprintf(stderr, "DigestInit failed\n");
+        ERR_print_errors_fp(stderr);
+        EXIT(100);
+    }
+    if (!EVP_DigestUpdate(&ctx, plaintext, pn)) {
+        fprintf(stderr, "DigestUpdate failed\n");
+        ERR_print_errors_fp(stderr);
+        EXIT(101);
+    }
+    if (!EVP_DigestFinal_ex(&ctx, md, &mdn)) {
+        fprintf(stderr, "DigestFinal failed\n");
+        ERR_print_errors_fp(stderr);
+        EXIT(101);
+    }
     EVP_MD_CTX_cleanup(&ctx);
 
-    if(mdn != cn)
-       {
-       fprintf(stderr,"Digest length mismatch, got %d expected %d\n",mdn,cn);
-       EXIT(102);
-       }
+    if (mdn != cn) {
+        fprintf(stderr, "Digest length mismatch, got %d expected %d\n", mdn,
+                cn);
+        EXIT(102);
+    }
 
-    if(memcmp(md,ciphertext,cn))
-       {
-       fprintf(stderr,"Digest mismatch\n");
-       hexdump(stderr,"Got",md,cn);
-       hexdump(stderr,"Expected",ciphertext,cn);
-       EXIT(103);
-       }
+    if (memcmp(md, ciphertext, cn)) {
+        fprintf(stderr, "Digest mismatch\n");
+        hexdump(stderr, "Got", md, cn);
+        hexdump(stderr, "Expected", ciphertext, cn);
+        EXIT(103);
+    }
 
     printf("\n");
 
     EVP_MD_CTX_cleanup(&ctx);
 
     return 1;
-    }
+}
 
-int main(int argc,char **argv)
-    {
+int main(int argc, char **argv)
+{
     const char *szTestFile;
     FILE *f;
 
-    if(argc != 2)
-       {
-       fprintf(stderr,"%s <test file>\n",argv[0]);
-       EXIT(1);
-       }
+    if (argc != 2) {
+        fprintf(stderr, "%s <test file>\n", argv[0]);
+        EXIT(1);
+    }
     CRYPTO_malloc_debug_init();
     CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
     CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
-    szTestFile=argv[1];
-
-    f=fopen(szTestFile,"r");
-    if(!f)
-       {
-       perror(szTestFile);
-       EXIT(2);
-       }
+    szTestFile = argv[1];
 
+    f = fopen(szTestFile, "r");
+    if (!f) {
+        perror(szTestFile);
+        EXIT(2);
+    }
+    ERR_load_crypto_strings();
     /* Load up the software EVP_CIPHER and EVP_MD definitions */
     OpenSSL_add_all_ciphers();
     OpenSSL_add_all_digests();
@@ -347,94 +480,109 @@ int main(int argc,char **argv)
     /* Load all compiled-in ENGINEs */
     ENGINE_load_builtin_engines();
 #endif
-#if 0
-    OPENSSL_config();
-#endif
 #ifndef OPENSSL_NO_ENGINE
-    /* Register all available ENGINE implementations of ciphers and digests.
-     * This could perhaps be changed to "ENGINE_register_all_complete()"? */
+    /*
+     * Register all available ENGINE implementations of ciphers and digests.
+     * This could perhaps be changed to "ENGINE_register_all_complete()"?
+     */
     ENGINE_register_all_ciphers();
     ENGINE_register_all_digests();
-    /* If we add command-line options, this statement should be switchable.
-     * It'll prevent ENGINEs being ENGINE_init()ialised for cipher/digest use if
-     * they weren't already initialised. */
+    /*
+     * If we add command-line options, this statement should be switchable.
+     * It'll prevent ENGINEs being ENGINE_init()ialised for cipher/digest use
+     * if they weren't already initialised.
+     */
     /* ENGINE_set_cipher_flags(ENGINE_CIPHER_FLAG_NOINIT); */
 #endif
 
-    for( ; ; )
-       {
-       char line[4096];
-       char *p;
-       char *cipher;
-       unsigned char *iv,*key,*plaintext,*ciphertext;
-       int encdec;
-       int kn,in,pn,cn;
-
-       if(!fgets((char *)line,sizeof line,f))
-           break;
-       if(line[0] == '#' || line[0] == '\n')
-           continue;
-       p=line;
-       cipher=sstrsep(&p,":"); 
-       key=ustrsep(&p,":");
-       iv=ustrsep(&p,":");
-       plaintext=ustrsep(&p,":");
-       ciphertext=ustrsep(&p,":");
-       if (p[-1] == '\n') {
-           p[-1] = '\0';
-           encdec = -1;
-       } else {
-           encdec = atoi(sstrsep(&p,"\n"));
-       }
-             
-
-       kn=convert(key);
-       in=convert(iv);
-       pn=convert(plaintext);
-       cn=convert(ciphertext);
-
-       if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec)
-          && !test_digest(cipher,plaintext,pn,ciphertext,cn))
-           {
+    for (;;) {
+        char line[4096];
+        char *p;
+        char *cipher;
+        unsigned char *iv, *key, *plaintext, *ciphertext, *aad, *tag;
+        int encdec;
+        int kn, in, pn, cn;
+        int an = 0;
+        int tn = 0;
+
+        if (!fgets((char *)line, sizeof line, f))
+            break;
+        if (line[0] == '#' || line[0] == '\n')
+            continue;
+        p = line;
+        cipher = sstrsep(&p, ":");
+        key = ustrsep(&p, ":");
+        iv = ustrsep(&p, ":");
+        plaintext = ustrsep(&p, ":");
+        ciphertext = ustrsep(&p, ":");
+        if (p[-1] == '\n') {
+            encdec = -1;
+            p[-1] = '\0';
+            tag = aad = NULL;
+            an = tn = 0;
+        } else {
+            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, aad, an,
+             tag, tn, encdec)
+            && !test_digest(cipher, plaintext, pn, ciphertext, cn)) {
 #ifdef OPENSSL_NO_AES
-           if (strstr(cipher, "AES") == cipher)
-               {
-               fprintf(stdout, "Cipher disabled, skipping %s\n", cipher); 
-               continue;
-               }
+            if (strstr(cipher, "AES") == cipher) {
+                fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
+                continue;
+            }
 #endif
 #ifdef OPENSSL_NO_DES
-           if (strstr(cipher, "DES") == cipher)
-               {
-               fprintf(stdout, "Cipher disabled, skipping %s\n", cipher); 
-               continue;
-               }
+            if (strstr(cipher, "DES") == cipher) {
+                fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
+                continue;
+            }
 #endif
 #ifdef OPENSSL_NO_RC4
-           if (strstr(cipher, "RC4") == cipher)
-               {
-               fprintf(stdout, "Cipher disabled, skipping %s\n", cipher); 
-               continue;
-               }
+            if (strstr(cipher, "RC4") == cipher) {
+                fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
+                continue;
+            }
 #endif
 #ifdef OPENSSL_NO_CAMELLIA
-           if (strstr(cipher, "CAMELLIA") == cipher)
-               {
-               fprintf(stdout, "Cipher disabled, skipping %s\n", cipher); 
-               continue;
-               }
+            if (strstr(cipher, "CAMELLIA") == cipher) {
+                fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
+                continue;
+            }
 #endif
 #ifdef OPENSSL_NO_SEED
-           if (strstr(cipher, "SEED") == cipher)
-               {
-               fprintf(stdout, "Cipher disabled, skipping %s\n", cipher); 
-               continue;
-               }
+            if (strstr(cipher, "SEED") == cipher) {
+                fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
+                continue;
+            }
 #endif
-           fprintf(stderr,"Can't find %s\n",cipher);
-           EXIT(3);
-           }
-       }
+            fprintf(stderr, "Can't find %s\n", cipher);
+            EXIT(3);
+        }
+    }
+    fclose(f);
 
 #ifndef OPENSSL_NO_ENGINE
     ENGINE_cleanup();
@@ -446,4 +594,4 @@ int main(int argc,char **argv)
     CRYPTO_mem_leaks_fp(stderr);
 
     return 0;
-    }
+}