Camellia cipher, contributed by NTT

Submitted by: Masashi Fujita Reviewed by: Bodo Moeller
2006-06-09 15:44:59 +00:00
parent fb7b393278
commit f3dea9a595
40 changed files with 1381 additions and 440 deletions
--- a/crypto/evp/evp_test.c
+++ b/crypto/evp/evp_test.c
@@ -416,6 +416,13 @@ int main(int argc,char **argv)
 		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
 	    fprintf(stderr,"Can't find %s\n",cipher);
 	    EXIT(3);