wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make "./configure no-ssl2" work again

Browse source 
PR: 1217
This commit is contained in:
Nils Larsch 2006-01-15 16:57:01 +00:00
parent 28251e7ff9
commit 45803988ce
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ssl/s23_meth.c
View file

@ -63,13 +63,21 @@
static SSL_METHOD *ssl23_get_method(int ver); static SSL_METHOD *ssl23_get_method(int ver);
static SSL_METHOD *ssl23_get_method(int ver) static SSL_METHOD *ssl23_get_method(int ver)
{ {
#ifndef OPENSSL_NO_SSL2
if (ver == SSL2_VERSION) if (ver == SSL2_VERSION)
return(SSLv2_method()); return(SSLv2_method());
else if (ver == SSL3_VERSION) else
#endif
#ifndef OPENSSL_NO_SSL3
if (ver == SSL3_VERSION)
return(SSLv3_method()); return(SSLv3_method());
else if (ver == TLS1_VERSION) else
#endif
#ifndef OPENSSL_NO_TLS1
if (ver == TLS1_VERSION)
return(TLSv1_method()); return(TLSv1_method());
else else
#endif
return(NULL); return(NULL);
} }

8
ssl/ssltest.c
View file

@ -2241,6 +2241,7 @@ static int do_test_cipherlist(void)
const SSL_METHOD *meth; const SSL_METHOD *meth;
SSL_CIPHER *ci, *tci = NULL; SSL_CIPHER *ci, *tci = NULL;
#ifndef OPENSSL_NO_SSL2
fprintf(stderr, "testing SSLv2 cipher list order: "); fprintf(stderr, "testing SSLv2 cipher list order: ");
meth = SSLv2_method(); meth = SSLv2_method();
while ((ci = meth->get_cipher(i++)) != NULL) while ((ci = meth->get_cipher(i++)) != NULL)
@ -2254,7 +2255,8 @@ static int do_test_cipherlist(void)
tci = ci; tci = ci;
} }
fprintf(stderr, "ok\n"); fprintf(stderr, "ok\n");
#endif
#ifndef OPENSSL_NO_SSL3
fprintf(stderr, "testing SSLv3 cipher list order: "); fprintf(stderr, "testing SSLv3 cipher list order: ");
meth = SSLv3_method(); meth = SSLv3_method();
tci = NULL; tci = NULL;
@ -2269,7 +2271,8 @@ static int do_test_cipherlist(void)
tci = ci; tci = ci;
} }
fprintf(stderr, "ok\n"); fprintf(stderr, "ok\n");
#endif
#ifndef OPENSSL_NO_TLS1
fprintf(stderr, "testing TLSv1 cipher list order: "); fprintf(stderr, "testing TLSv1 cipher list order: ");
meth = TLSv1_method(); meth = TLSv1_method();
tci = NULL; tci = NULL;
@ -2284,6 +2287,7 @@ static int do_test_cipherlist(void)
tci = ci; tci = ci;
} }
fprintf(stderr, "ok\n"); fprintf(stderr, "ok\n");
#endif
return 1; return 1;
} }