diff options
| author | Nils Larsch <nils@openssl.org> | 2006-01-15 17:35:28 +0000 |
|---|---|---|
| committer | Nils Larsch <nils@openssl.org> | 2006-01-15 17:35:28 +0000 |
| commit | 00fe865dbec8fb626a63ed9f5b0be4073597c7a8 (patch) | |
| tree | 1f9b5288130c28ef45725305c5d2b711b432b7ed /ssl/s23_meth.c | |
| parent | 9e9bececa9e9a89bf7b42a90c95b06eb3a2ee7a3 (diff) | |
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/s23_meth.c')
| -rw-r--r-- | ssl/s23_meth.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c index 115dc11a7e..c6099efcf7 100644 --- a/ssl/s23_meth.c +++ b/ssl/s23_meth.c @@ -63,13 +63,21 @@ static const SSL_METHOD *ssl23_get_method(int ver); static const SSL_METHOD *ssl23_get_method(int ver) { +#ifndef OPENSSL_NO_SSL2 if (ver == SSL2_VERSION) return(SSLv2_method()); - else if (ver == SSL3_VERSION) + else +#endif +#ifndef OPENSSL_NO_SSL3 + if (ver == SSL3_VERSION) return(SSLv3_method()); - else if (ver == TLS1_VERSION) + else +#endif +#ifndef OPENSSL_NO_TLS1 + if (ver == TLS1_VERSION) return(TLSv1_method()); else +#endif return(NULL); } |