diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2014-11-29 16:17:54 +0100 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2014-12-02 11:29:07 +0100 |
| commit | 5004c22c25af92358eaab4ac515686d096a0f84c (patch) | |
| tree | cfd73baa93d67a761d2c1491474f06d15d69be77 | |
| parent | e96872f4c03325dacf6eaaa0da2bdf8574f3e6fa (diff) | |
Use the SSLv23 method by default
If SSLv2 and SSLv3 are both disabled we still support SSL/TLS.
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | apps/ocsp.c | 9 | ||||
| -rw-r--r-- | apps/s_time.c | 6 |
2 files changed, 0 insertions, 15 deletions
diff --git a/apps/ocsp.c b/apps/ocsp.c index 3beec781e4..8883afc956 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -1399,16 +1399,7 @@ OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req, if (use_ssl == 1) { BIO *sbio; -#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3) ctx = SSL_CTX_new(SSLv23_client_method()); -#elif !defined(OPENSSL_NO_SSL3) - ctx = SSL_CTX_new(SSLv3_client_method()); -#elif !defined(OPENSSL_NO_SSL2) - ctx = SSL_CTX_new(SSLv2_client_method()); -#else - BIO_printf(err, "SSL is disabled\n"); - goto end; -#endif if (ctx == NULL) { BIO_printf(err, "Error creating SSL context.\n"); diff --git a/apps/s_time.c b/apps/s_time.c index b823c33c58..81dad53243 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -349,13 +349,7 @@ int MAIN(int argc, char **argv) if (bio_err == NULL) bio_err=BIO_new_fp(stderr,BIO_NOCLOSE); -#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3) s_time_meth=SSLv23_client_method(); -#elif !defined(OPENSSL_NO_SSL3) - s_time_meth=SSLv3_client_method(); -#elif !defined(OPENSSL_NO_SSL2) - s_time_meth=SSLv2_client_method(); -#endif /* parse the command line arguments */ if( parseArgs( argc, argv ) < 0 ) |