diff options
| author | Nils Larsch <nils@openssl.org> | 2006-01-15 18:35:28 +0100 |
|---|---|---|
| committer | Nils Larsch <nils@openssl.org> | 2006-01-15 18:35:28 +0100 |
| commit | 00fe865dbec8fb626a63ed9f5b0be4073597c7a8 (patch) | |
| tree | 1f9b5288130c28ef45725305c5d2b711b432b7ed /ssl/ssltest.c | |
| parent | Fix from stable branch. (diff) | |
| download | openssl-00fe865dbec8fb626a63ed9f5b0be4073597c7a8.tar.xz openssl-00fe865dbec8fb626a63ed9f5b0be4073597c7a8.zip | |
recent changes from 0.9.8: fix cipher list order in s3_lib.c,
make "no-ssl2" work again
PR: 1217
Diffstat (limited to 'ssl/ssltest.c')
| -rw-r--r-- | ssl/ssltest.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 5f74c51b38..9b7a387ba3 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -2241,6 +2241,7 @@ static int do_test_cipherlist(void) const SSL_METHOD *meth; SSL_CIPHER *ci, *tci = NULL; +#ifndef OPENSSL_NO_SSL2 fprintf(stderr, "testing SSLv2 cipher list order: "); meth = SSLv2_method(); while ((ci = meth->get_cipher(i++)) != NULL) @@ -2254,7 +2255,8 @@ static int do_test_cipherlist(void) tci = ci; } fprintf(stderr, "ok\n"); - +#endif +#ifndef OPENSSL_NO_SSL3 fprintf(stderr, "testing SSLv3 cipher list order: "); meth = SSLv3_method(); tci = NULL; @@ -2269,7 +2271,8 @@ static int do_test_cipherlist(void) tci = ci; } fprintf(stderr, "ok\n"); - +#endif +#ifndef OPENSSL_NO_TLS1 fprintf(stderr, "testing TLSv1 cipher list order: "); meth = TLSv1_method(); tci = NULL; @@ -2284,6 +2287,7 @@ static int do_test_cipherlist(void) tci = ci; } fprintf(stderr, "ok\n"); +#endif return 1; } |