generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New option no-ssl3-method which removes SSLv3_*method

Browse Source 
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 <emilia@openssl.org>

(cherry picked from commit 3881d8106d)
This commit is contained in:
Dr. Stephen Henson
2014-10-29 12:51:31 +00:00
parent 786370b1b0
commit 017a15cbd2
11 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/ssltest.c
View File

@@ -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;