1 files changed, 44 insertions, 17 deletions

diff --git a/src/lib/libcrypto/evp/evp_test.c b/src/lib/libcrypto/evp/evp_test.c
index a624cfd248..bb6f02c2e9 100644
--- a/src/lib/libcrypto/evp/evp_test.c
+++ b/src/lib/libcrypto/evp/evp_test.c
@@ -52,6 +52,7 @@
 
 #include "../e_os.h"
 
+#include <openssl/opensslconf.h>
 #include <openssl/evp.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
@@ -136,7 +137,7 @@ 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,int multiplier)
+                  int encdec)
     {
     EVP_CIPHER_CTX ctx;
     unsigned char out[4096];
@@ -167,7 +168,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
             }
         EVP_CIPHER_CTX_set_padding(&ctx,0);
 
-        if(!EVP_EncryptUpdate(&ctx,out,&outl,plaintext,pn*multiplier))
+        if(!EVP_EncryptUpdate(&ctx,out,&outl,plaintext,pn))
             {
             fprintf(stderr,"Encrypt failed\n");
             ERR_print_errors_fp(stderr);
@@ -180,7 +181,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
             test1_exit(7);
             }
 
-        if(outl+outl2 != cn*multiplier)
+        if(outl+outl2 != cn)
             {
             fprintf(stderr,"Ciphertext length mismatch got %d expected %d\n",
                     outl+outl2,cn);
@@ -206,7 +207,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
             }
         EVP_CIPHER_CTX_set_padding(&ctx,0);
 
-        if(!EVP_DecryptUpdate(&ctx,out,&outl,ciphertext,cn*multiplier))
+        if(!EVP_DecryptUpdate(&ctx,out,&outl,ciphertext,cn))
             {
             fprintf(stderr,"Decrypt failed\n");
             ERR_print_errors_fp(stderr);
@@ -219,7 +220,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
             test1_exit(7);
             }
 
-        if(outl+outl2 != cn*multiplier)
+        if(outl+outl2 != cn)
             {
             fprintf(stderr,"Plaintext length mismatch got %d expected %d\n",
                     outl+outl2,cn);
@@ -244,7 +245,7 @@ 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,int multiplier)
+                       int encdec)
     {
     const EVP_CIPHER *c;
 
@@ -252,7 +253,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,multiplier);
+    test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec);
 
     return 1;
     }
@@ -368,7 +369,6 @@ int main(int argc,char **argv)
         unsigned char *iv,*key,*plaintext,*ciphertext;
         int encdec;
         int kn,in,pn,cn;
-        int multiplier=1;
 
         if(!fgets((char *)line,sizeof line,f))
             break;
@@ -393,17 +393,44 @@ int main(int argc,char **argv)
         pn=convert(plaintext);
         cn=convert(ciphertext);
 
-        if(strchr(cipher,'*'))
-            {
-            p=cipher;
-            sstrsep(&p,"*");
-            multiplier=atoi(sstrsep(&p,"*"));
-            }
-
-        if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec,
-                        multiplier)
+        if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn,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);
             }