diff options
| author | Rob Austein <sra@hactrn.net> | 2006-10-09 16:47:10 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2006-10-09 16:47:10 +0000 |
| commit | 4043d7db4e466d15193c3bad3b204048fc13b785 (patch) | |
| tree | 8156ce31a6e4a155fc240551f48c23b5a42a6e5e /openssl/trunk/crypto/evp/evp_test.c | |
| parent | aba277548b76071e75fc9478002a6fc2145f64f1 (diff) | |
Merged in changes from OpenSSL 0.9.8d
svn path=/openssl/trunk/CHANGES; revision=377
Diffstat (limited to 'openssl/trunk/crypto/evp/evp_test.c')
| -rw-r--r-- | openssl/trunk/crypto/evp/evp_test.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/openssl/trunk/crypto/evp/evp_test.c b/openssl/trunk/crypto/evp/evp_test.c index 3bf8e9ab..6ecbecce 100644 --- a/openssl/trunk/crypto/evp/evp_test.c +++ b/openssl/trunk/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); } |