diff options
| author | David Benjamin <davidben@chromium.org> | 2014-09-24 13:53:56 -0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-09-24 22:33:37 +0000 |
| commit | 7f520dbd8d4e0006f6c8279c681ee149c961c104 (patch) | |
| tree | ebe11cb075373c4868d9856f850afb150fa97ca6 | |
| parent | 37d924640a34da1dce96fa404843e95e055e3cbf (diff) | |
| download | src-7f520dbd8d4e0006f6c8279c681ee149c961c104.tar.gz | |
Remove OPENSSL_NO_TLS1_2_CLIENT and OPENSSL_NO_DTLS1.
Get those out of the way.
Change-Id: Ia1be476e383fc90c2373a24a072944fe377da6ef
Reviewed-on: https://boringssl-review.googlesource.com/1820
Reviewed-by: Adam Langley <agl@google.com>
| -rw-r--r-- | ssl/s23_clnt.c | 9 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index cec6f8c..b51ddf7 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c @@ -288,17 +288,10 @@ static int ssl23_client_hello(SSL *s) * TLS1>=1, it would be insufficient to pass SSL_NO_TLSv1, the * answer is SSL_OP_NO_TLSv1|SSL_OP_NO_SSLv3|SSL_OP_NO_SSLv2. */ - mask = SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1 - |SSL_OP_NO_SSLv3 - ; -#if !defined(OPENSSL_NO_TLS1_2_CLIENT) + mask = SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1|SSL_OP_NO_SSLv3; version = TLS1_2_VERSION; - if ((options & SSL_OP_NO_TLSv1_2) && (options & mask) != mask) version = TLS1_1_VERSION; -#else - version = TLS1_1_VERSION; -#endif mask &= ~SSL_OP_NO_TLSv1_1; if ((options & SSL_OP_NO_TLSv1_1) && (options & mask) != mask) version = TLS1_VERSION; diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index ec054d2..720ab54 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1151,11 +1151,8 @@ long SSL_ctrl(SSL *s,int cmd,long larg,void *parg) s->max_cert_list=larg; return(l); case SSL_CTRL_SET_MTU: -#ifndef OPENSSL_NO_DTLS1 if (larg < (long)dtls1_min_mtu()) return 0; -#endif - if (SSL_IS_DTLS(s)) { s->d1->mtu = larg; |