From 017a15cbd290a6fd008f19d1873071f36a624b1b Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 29 Oct 2014 12:51:31 +0000 Subject: New option no-ssl3-method which removes SSLv3_*method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When no-ssl3 is set only make SSLv3 disabled by default. Retain -ssl3 options for s_client/s_server/ssltest. When no-ssl3-method is set SSLv3_*method() is removed and all -ssl3 options. We should document this somewhere, e.g. wiki, FAQ or manual page. Reviewed-by: Emilia Käsper (cherry picked from commit 3881d8106df732fc433d30446625dfa2396da42d) --- ssl/ssltest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ssl/ssltest.c') diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 406a80103d..9867504454 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -701,7 +701,7 @@ static void sv_usage(void) #ifndef OPENSSL_NO_SSL2 fprintf(stderr," -ssl2 - use SSLv2\n"); #endif -#ifndef OPENSSL_NO_SSL3 +#ifndef OPENSSL_NO_SSL3_METHOD fprintf(stderr," -ssl3 - use SSLv3\n"); #endif #ifndef OPENSSL_NO_TLS1 @@ -1039,7 +1039,7 @@ int main(int argc, char *argv[]) } else if (strcmp(*argv,"-ssl3") == 0) { -#ifdef OPENSSL_NO_SSL3 +#ifdef OPENSSL_NO_SSL3_METHOD no_protocol = 1; #endif ssl3 = 1; -- cgit v1.2.3