diff options
| author |   jsing <jsing@openbsd.org> | 2020-07-14 18:47:50 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2020-07-14 18:47:50 +0000 |
| commit | a759cde332bbdfce0303804fde89791482d36fc5 (patch) | |
| tree | f9878e76a13eead17fa86f42eb804ed34ba5860f /lib/libssl/ssl_lib.c | |
| parent | Enter the certs regress directory. (diff) | |
| download | wireguard-openbsd-a759cde332bbdfce0303804fde89791482d36fc5.tar.xz wireguard-openbsd-a759cde332bbdfce0303804fde89791482d36fc5.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 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index b93a851507e..5fd705c93af 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.218 2020/07/07 19:31:11 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.219 2020/07/14 18:47:50 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -2226,15 +2226,6 @@ SSL_set_ssl_method(SSL *s, const SSL_METHOD *meth) ret = s->method->internal->ssl_new(s); } - /* - * XXX - reset the client max version to that of the incoming - * method, otherwise a caller that uses a TLS_method() and then - * sets with TLS_client_method() cannot do TLSv1.3. - */ - if (meth->internal->max_version == TLS1_3_VERSION && - meth->internal->ssl_connect != NULL) - s->internal->max_version = meth->internal->max_version; - if (conn == 1) s->internal->handshake_func = meth->internal->ssl_connect; else if (conn == 0) |