diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2014-10-15 03:25:50 -0400 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2014-10-15 08:49:50 -0400 |
| commit | 9bf3ff1ca06e1bc8bd0c0cc52a9b92ac20f21c83 (patch) | |
| tree | 0f847157e7deb4bb33baddde03732a1129753697 /ssl | |
| parent | 74f77d40a9306724eef2a89298e9caa241eac81e (diff) | |
Fix no-ssl3 configuration option
CVE-2014-3568
Reviewed-by: Emilia Kasper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s23_clnt.c | 9 | ||||
| -rw-r--r-- | ssl/s23_srvr.c | 15 |
2 files changed, 16 insertions, 8 deletions
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index 4183a02d32..72e7b2064d 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c @@ -125,9 +125,11 @@ static const SSL_METHOD *ssl23_get_client_method(int ver) if (ver == SSL2_VERSION) return(SSLv2_client_method()); #endif +#ifndef OPENSSL_NO_SSL3 if (ver == SSL3_VERSION) return(SSLv3_client_method()); - else if (ver == TLS1_VERSION) +#endif + if (ver == TLS1_VERSION) return(TLSv1_client_method()); else return(NULL); @@ -614,13 +616,16 @@ static int ssl23_get_server_hello(SSL *s) { /* we have sslv3 or tls1 (server hello or alert) */ +#ifndef OPENSSL_NO_SSL3 if ((p[2] == SSL3_VERSION_MINOR) && !(s->options & SSL_OP_NO_SSLv3)) { s->version=SSL3_VERSION; s->method=SSLv3_client_method(); } - else if ((p[2] == TLS1_VERSION_MINOR) && + else +#endif + if ((p[2] == TLS1_VERSION_MINOR) && !(s->options & SSL_OP_NO_TLSv1)) { s->version=TLS1_VERSION; diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c index 9a88cef15c..75c48ceb0b 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c @@ -124,9 +124,11 @@ static const SSL_METHOD *ssl23_get_server_method(int ver) if (ver == SSL2_VERSION) return(SSLv2_server_method()); #endif +#ifndef OPENSSL_NO_SSL3 if (ver == SSL3_VERSION) return(SSLv3_server_method()); - else if (ver == TLS1_VERSION) +#endif + if (ver == TLS1_VERSION) return(TLSv1_server_method()); else return(NULL); @@ -559,6 +561,12 @@ int ssl23_get_client_hello(SSL *s) if ((type == 2) || (type == 3)) { /* we have SSLv3/TLSv1 (type 2: SSL2 style, type 3: SSL3/TLS style) */ + s->method = ssl23_get_server_method(s->version); + if (s->method == NULL) + { + SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_UNSUPPORTED_PROTOCOL); + goto err; + } if (!ssl_init_wbio_buffer(s,1)) goto err; @@ -586,11 +594,6 @@ int ssl23_get_client_hello(SSL *s) s->s3->rbuf.left=0; s->s3->rbuf.offset=0; } - - if (s->version == TLS1_VERSION) - s->method = TLSv1_server_method(); - else - s->method = SSLv3_server_method(); #if 0 /* ssl3_get_client_hello does this */ s->client_version=(v[0]<<8)|v[1]; #endif |