diff options
author | jsing <> | 2019-03-19 16:53:03 +0000 |
---|---|---|
committer | jsing <> | 2019-03-19 16:53:03 +0000 |
commit | 962b1b0ed5b16b038f5d40e6fb7016cd60a6eaac (patch) | |
tree | 262e7498526b6384dd4598673843aec336cc680d /src/lib/libssl/ssl_clnt.c | |
parent | 277c01d4872af51c7ce52c92dc8bb37c50c129c6 (diff) | |
download | openbsd-962b1b0ed5b16b038f5d40e6fb7016cd60a6eaac.tar.gz openbsd-962b1b0ed5b16b038f5d40e6fb7016cd60a6eaac.tar.bz2 openbsd-962b1b0ed5b16b038f5d40e6fb7016cd60a6eaac.zip |
Revert TLS1_get{,_client}_version simplification because DTLS.
Diffstat (limited to 'src/lib/libssl/ssl_clnt.c')
-rw-r--r-- | src/lib/libssl/ssl_clnt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c index 5da53d8445..f3c439e6c0 100644 --- a/src/lib/libssl/ssl_clnt.c +++ b/src/lib/libssl/ssl_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_clnt.c,v 1.57 2019/03/17 15:16:39 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_clnt.c,v 1.58 2019/03/19 16:53:03 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 | * |
@@ -950,7 +950,7 @@ ssl3_get_server_hello(SSL *s) | |||
950 | 950 | ||
951 | /* TLS v1.2 only ciphersuites require v1.2 or later. */ | 951 | /* TLS v1.2 only ciphersuites require v1.2 or later. */ |
952 | if ((cipher->algorithm_ssl & SSL_TLSV1_2) && | 952 | if ((cipher->algorithm_ssl & SSL_TLSV1_2) && |
953 | (s->version < TLS1_2_VERSION)) { | 953 | (TLS1_get_version(s) < TLS1_2_VERSION)) { |
954 | al = SSL_AD_ILLEGAL_PARAMETER; | 954 | al = SSL_AD_ILLEGAL_PARAMETER; |
955 | SSLerror(s, SSL_R_WRONG_CIPHER_RETURNED); | 955 | SSLerror(s, SSL_R_WRONG_CIPHER_RETURNED); |
956 | goto f_err; | 956 | goto f_err; |