diff options
| author | Rob Austein <sra@hactrn.net> | 2006-10-09 16:29:05 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2006-10-09 16:29:05 +0000 |
| commit | 1b2aa7959c86a835491c8cfca8c0683b747c1855 (patch) | |
| tree | 9a0ba58647a2d57115f5c003ca4673e7693c950a /openssl/vendor/current/crypto/evp/evp_test.c | |
| parent | 084adb601f2d375395c6cdcedf8af91f1065fe4e (diff) | |
Merge in vendor branch OpenSSL changes 0.9.8b -> 0.9.8d
svn path=/openssl/vendor/current/CHANGES; revision=375
Diffstat (limited to 'openssl/vendor/current/crypto/evp/evp_test.c')
| -rw-r--r-- | openssl/vendor/current/crypto/evp/evp_test.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/openssl/vendor/current/crypto/evp/evp_test.c b/openssl/vendor/current/crypto/evp/evp_test.c index 3bf8e9ab..6ecbecce 100644 --- a/openssl/vendor/current/crypto/evp/evp_test.c +++ b/openssl/vendor/current/crypto/evp/evp_test.c @@ -417,6 +417,13 @@ int main(int argc,char **argv) 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); } |