summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2020-07-14 18:47:50 +0000
committerjsing <>2020-07-14 18:47:50 +0000
commitada595bf91598989bfe89b4f3291739f4d848c5f (patch)
treeed69a2310f09083a6f1f0a83f4c01732e92f814a /src
parent190316e2afd31e6005940c70d981e0b5b40f61d6 (diff)
downloadopenbsd-ada595bf91598989bfe89b4f3291739f4d848c5f.tar.gz
openbsd-ada595bf91598989bfe89b4f3291739f4d848c5f.tar.bz2
openbsd-ada595bf91598989bfe89b4f3291739f4d848c5f.zip
Revert the TLSv1.3 version switching fix/hack.
This is no longer necessary since the TLS_method() now supports TLSv1.3. Reverts r1.211 of ssl_lib.c. ok beck@ inoguchi@ tb@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/ssl_lib.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index b93a851507..5fd705c93a 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_lib.c,v 1.218 2020/07/07 19:31:11 jsing Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.219 2020/07/14 18:47:50 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -2226,15 +2226,6 @@ SSL_set_ssl_method(SSL *s, const SSL_METHOD *meth)
2226 ret = s->method->internal->ssl_new(s); 2226 ret = s->method->internal->ssl_new(s);
2227 } 2227 }
2228 2228
2229 /*
2230 * XXX - reset the client max version to that of the incoming
2231 * method, otherwise a caller that uses a TLS_method() and then
2232 * sets with TLS_client_method() cannot do TLSv1.3.
2233 */
2234 if (meth->internal->max_version == TLS1_3_VERSION &&
2235 meth->internal->ssl_connect != NULL)
2236 s->internal->max_version = meth->internal->max_version;
2237
2238 if (conn == 1) 2229 if (conn == 1)
2239 s->internal->handshake_func = meth->internal->ssl_connect; 2230 s->internal->handshake_func = meth->internal->ssl_connect;
2240 else if (conn == 0) 2231 else if (conn == 0)