diff options
author | jsing <> | 2017-01-03 16:57:15 +0000 |
---|---|---|
committer | jsing <> | 2017-01-03 16:57:15 +0000 |
commit | 5bf1d8eae1dc8ce16782f7063874adf628e6d7c8 (patch) | |
tree | 578935c9d2b0a3d0cd5d0f160e725d3c62e7a3f7 /src/lib/libssl/s23_clnt.c | |
parent | c20fa45999bc9c9e18b6372552c975600aa2aae2 (diff) | |
download | openbsd-5bf1d8eae1dc8ce16782f7063874adf628e6d7c8.tar.gz openbsd-5bf1d8eae1dc8ce16782f7063874adf628e6d7c8.tar.bz2 openbsd-5bf1d8eae1dc8ce16782f7063874adf628e6d7c8.zip |
Pull out, rework and dedup the code that determines the highest shared
version.
ok beck@ doug@
Diffstat (limited to 'src/lib/libssl/s23_clnt.c')
-rw-r--r-- | src/lib/libssl/s23_clnt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c index 2511a94b28..c4fad5b011 100644 --- a/src/lib/libssl/s23_clnt.c +++ b/src/lib/libssl/s23_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s23_clnt.c,v 1.48 2016/12/30 16:57:01 jsing Exp $ */ | 1 | /* $OpenBSD: s23_clnt.c,v 1.49 2017/01/03 16:57:15 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 | * |
@@ -239,7 +239,7 @@ ssl23_client_hello(SSL *s) | |||
239 | if (s->state == SSL23_ST_CW_CLNT_HELLO_A) { | 239 | if (s->state == SSL23_ST_CW_CLNT_HELLO_A) { |
240 | arc4random_buf(s->s3->client_random, SSL3_RANDOM_SIZE); | 240 | arc4random_buf(s->s3->client_random, SSL3_RANDOM_SIZE); |
241 | 241 | ||
242 | if (ssl_enabled_version_range(s, NULL, &version) == -1) { | 242 | if (ssl_enabled_version_range(s, NULL, &version) != 1) { |
243 | SSLerr(SSL_F_SSL23_CLIENT_HELLO, | 243 | SSLerr(SSL_F_SSL23_CLIENT_HELLO, |
244 | SSL_R_NO_PROTOCOLS_AVAILABLE); | 244 | SSL_R_NO_PROTOCOLS_AVAILABLE); |
245 | return (-1); | 245 | return (-1); |