diff options
author | jsing <> | 2014-06-11 15:17:19 +0000 |
---|---|---|
committer | jsing <> | 2014-06-11 15:17:19 +0000 |
commit | db6f3580d58467f7c617ba3534162f36903a2fdc (patch) | |
tree | ab13f82dcf0f6baca1cef4ba121da7c03a13fac8 /src/lib/libssl/s23_clnt.c | |
parent | 1cb9257d81d89a6f2d941f4e009fdd8c4061956e (diff) | |
download | openbsd-db6f3580d58467f7c617ba3534162f36903a2fdc.tar.gz openbsd-db6f3580d58467f7c617ba3534162f36903a2fdc.tar.bz2 openbsd-db6f3580d58467f7c617ba3534162f36903a2fdc.zip |
Disable TLS support...
Just kidding!
unifdef OPENSSL_NO_TLS since we will never want to actually do that.
ok deraadt@
Diffstat (limited to 'src/lib/libssl/s23_clnt.c')
-rw-r--r-- | src/lib/libssl/s23_clnt.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c index 1bc582364b..7a42b1f0ea 100644 --- a/src/lib/libssl/s23_clnt.c +++ b/src/lib/libssl/s23_clnt.c | |||
@@ -309,14 +309,10 @@ ssl23_client_hello(SSL *s) | |||
309 | * answer is SSL_OP_NO_TLSv1|SSL_OP_NO_SSLv3|SSL_OP_NO_SSLv2. | 309 | * answer is SSL_OP_NO_TLSv1|SSL_OP_NO_SSLv3|SSL_OP_NO_SSLv2. |
310 | */ | 310 | */ |
311 | mask = SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1|SSL_OP_NO_SSLv3; | 311 | mask = SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1|SSL_OP_NO_SSLv3; |
312 | #if !defined(OPENSSL_NO_TLS1_2_CLIENT) | ||
313 | version = TLS1_2_VERSION; | 312 | version = TLS1_2_VERSION; |
314 | 313 | ||
315 | if ((options & SSL_OP_NO_TLSv1_2) && (options & mask) != mask) | 314 | if ((options & SSL_OP_NO_TLSv1_2) && (options & mask) != mask) |
316 | version = TLS1_1_VERSION; | 315 | version = TLS1_1_VERSION; |
317 | #else | ||
318 | version = TLS1_1_VERSION; | ||
319 | #endif | ||
320 | mask &= ~SSL_OP_NO_TLSv1_1; | 316 | mask &= ~SSL_OP_NO_TLSv1_1; |
321 | if ((options & SSL_OP_NO_TLSv1_1) && (options & mask) != mask) | 317 | if ((options & SSL_OP_NO_TLSv1_1) && (options & mask) != mask) |
322 | version = TLS1_VERSION; | 318 | version = TLS1_VERSION; |