X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fevp%2Fevp_test.c;h=bc15348f5ee67715694bc5c400bcd8980a7350ea;hp=447a431a04383f896cc4fd0e2522193091b8de5b;hb=282a480a352e2aac4fad6e75932d951659bff62d;hpb=55f78baf32f213301a0e8d6c6e7f40bd3b9857b1

diff --git a/crypto/evp/evp_test.c b/crypto/evp/evp_test.c
index 447a431a04..bc15348f5e 100644
--- a/crypto/evp/evp_test.c
+++ b/crypto/evp/evp_test.c
@@ -52,8 +52,12 @@
 
 #include "../e_os.h"
 
+#include <openssl/opensslconf.h>
 #include <openssl/evp.h>
+#ifndef OPENSSL_NO_ENGINE
 #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)
@@ -123,15 +127,23 @@ static char *sstrsep(char **string, const char *delim)
 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,
+		  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)")));
@@ -140,39 +152,112 @@ 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 %d\n",kn,
-		c->key_len);
-	EXIT(5);
+	fprintf(stderr,"Key length doesn't match, got %d expected %lu\n",kn,
+		(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");
-	    EXIT(10);
+	    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");
-	    EXIT(6);
+	    ERR_print_errors_fp(stderr);
+	    test1_exit(6);
 	    }
 	if(!EVP_EncryptFinal_ex(&ctx,out+outl,&outl2))
 	    {
 	    fprintf(stderr,"EncryptFinal failed\n");
-	    EXIT(7);
+	    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);
-	    EXIT(8);
+	    test1_exit(8);
 	    }
 
 	if(memcmp(out,ciphertext,cn))
@@ -180,43 +265,138 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
 	    fprintf(stderr,"Ciphertext mismatch\n");
 	    hexdump(stderr,"Got",out,cn);
 	    hexdump(stderr,"Expected",ciphertext,cn);
-	    EXIT(9);
+	    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");
-	    EXIT(11);
+	    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");
-	    EXIT(6);
+	    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");
-	    EXIT(7);
+	    ERR_print_errors_fp(stderr);
+	    test1_exit(7);
 	    }
 
-	if(outl+outl2 != cn)
+	if(outl+outl2 != pn)
 	    {
 	    fprintf(stderr,"Plaintext length mismatch got %d expected %d\n",
-		    outl+outl2,cn);
-	    EXIT(8);
+		    outl+outl2,pn);
+	    test1_exit(8);
 	    }
 
-	if(memcmp(out,plaintext,cn))
+	if(memcmp(out,plaintext,pn))
 	    {
 	    fprintf(stderr,"Plaintext mismatch\n");
-	    hexdump(stderr,"Got",out,cn);
-	    hexdump(stderr,"Expected",plaintext,cn);
-	    EXIT(9);
+	    hexdump(stderr,"Got",out,pn);
+	    hexdump(stderr,"Expected",plaintext,pn);
+	    test1_exit(9);
 	    }
 	}
 
@@ -229,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;
@@ -237,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;
     }
@@ -263,16 +445,19 @@ static int test_digest(const char *digest,
     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);
@@ -324,11 +509,14 @@ int main(int argc,char **argv)
     /* Load up the software EVP_CIPHER and EVP_MD definitions */
     OpenSSL_add_all_ciphers();
     OpenSSL_add_all_digests();
+#ifndef OPENSSL_NO_ENGINE
     /* 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()"? */
     ENGINE_register_all_ciphers();
@@ -337,15 +525,18 @@ int main(int argc,char **argv)
      * 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;
+	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;
@@ -358,30 +549,84 @@ 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
+	    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;
+		}
+#endif
+#ifdef OPENSSL_NO_RC4
+	    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;
+		}
+#endif
+#ifdef OPENSSL_NO_SEED
+	    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);
 	    }
 	}
+	fclose(f);
 
+#ifndef OPENSSL_NO_ENGINE
     ENGINE_cleanup();
+#endif
     EVP_cleanup();
     CRYPTO_cleanup_all_ex_data();
-    ERR_remove_state(0);
+    ERR_remove_thread_state(NULL);
     ERR_free_strings();
     CRYPTO_mem_leaks_fp(stderr);