diff options
author | jsing <> | 2017-01-23 14:35:42 +0000 |
---|---|---|
committer | jsing <> | 2017-01-23 14:35:42 +0000 |
commit | d43892e9652017c33ea2cf69639dc9a01090be5f (patch) | |
tree | 27eab6f3272b4b46f77e786896eae8e697800969 /src/lib/libssl/s23_clnt.c | |
parent | 0eff443f2ac1ae9043870f2d40d9dc0d57f236d6 (diff) | |
download | openbsd-d43892e9652017c33ea2cf69639dc9a01090be5f.tar.gz openbsd-d43892e9652017c33ea2cf69639dc9a01090be5f.tar.bz2 openbsd-d43892e9652017c33ea2cf69639dc9a01090be5f.zip |
Move options and mode from SSL_CTX and SSL to internal, since these can be
set and cleared via existing functions.
Diffstat (limited to 'src/lib/libssl/s23_clnt.c')
-rw-r--r-- | src/lib/libssl/s23_clnt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c index 282e0bd3c7..b2dc912a9c 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.55 2017/01/23 13:36:13 jsing Exp $ */ | 1 | /* $OpenBSD: s23_clnt.c,v 1.56 2017/01/23 14:35:42 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 | * |
@@ -372,15 +372,15 @@ ssl23_get_server_hello(SSL *s) | |||
372 | /* we have sslv3 or tls1 (server hello or alert) */ | 372 | /* we have sslv3 or tls1 (server hello or alert) */ |
373 | 373 | ||
374 | if ((p[2] == TLS1_VERSION_MINOR) && | 374 | if ((p[2] == TLS1_VERSION_MINOR) && |
375 | !(s->options & SSL_OP_NO_TLSv1)) { | 375 | !(s->internal->options & SSL_OP_NO_TLSv1)) { |
376 | s->version = TLS1_VERSION; | 376 | s->version = TLS1_VERSION; |
377 | s->method = TLSv1_client_method(); | 377 | s->method = TLSv1_client_method(); |
378 | } else if ((p[2] == TLS1_1_VERSION_MINOR) && | 378 | } else if ((p[2] == TLS1_1_VERSION_MINOR) && |
379 | !(s->options & SSL_OP_NO_TLSv1_1)) { | 379 | !(s->internal->options & SSL_OP_NO_TLSv1_1)) { |
380 | s->version = TLS1_1_VERSION; | 380 | s->version = TLS1_1_VERSION; |
381 | s->method = TLSv1_1_client_method(); | 381 | s->method = TLSv1_1_client_method(); |
382 | } else if ((p[2] == TLS1_2_VERSION_MINOR) && | 382 | } else if ((p[2] == TLS1_2_VERSION_MINOR) && |
383 | !(s->options & SSL_OP_NO_TLSv1_2)) { | 383 | !(s->internal->options & SSL_OP_NO_TLSv1_2)) { |
384 | s->version = TLS1_2_VERSION; | 384 | s->version = TLS1_2_VERSION; |
385 | s->method = TLSv1_2_client_method(); | 385 | s->method = TLSv1_2_client_method(); |
386 | } else { | 386 | } else { |