diff options
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index f728eb7648..697ac6c7c5 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_lib.c,v 1.142 2017/05/06 22:24:57 beck Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.143 2017/05/07 04:22:24 beck 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 | * |
@@ -2540,7 +2540,7 @@ ssl3_shutdown(SSL *s) | |||
2540 | * Don't do anything much if we have not done the handshake or | 2540 | * Don't do anything much if we have not done the handshake or |
2541 | * we don't want to send messages :-) | 2541 | * we don't want to send messages :-) |
2542 | */ | 2542 | */ |
2543 | if ((s->internal->quiet_shutdown) || (s->internal->state == SSL_ST_BEFORE)) { | 2543 | if ((s->internal->quiet_shutdown) || (S3I(s)->hs.state == SSL_ST_BEFORE)) { |
2544 | s->internal->shutdown = (SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN); | 2544 | s->internal->shutdown = (SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN); |
2545 | return (1); | 2545 | return (1); |
2546 | } | 2546 | } |
@@ -2704,7 +2704,7 @@ ssl3_renegotiate_check(SSL *s) | |||
2704 | * to SSL_ST_ACCEPT. | 2704 | * to SSL_ST_ACCEPT. |
2705 | */ | 2705 | */ |
2706 | /* SSL_ST_ACCEPT */ | 2706 | /* SSL_ST_ACCEPT */ |
2707 | s->internal->state = SSL_ST_RENEGOTIATE; | 2707 | S3I(s)->hs.state = SSL_ST_RENEGOTIATE; |
2708 | S3I(s)->renegotiate = 0; | 2708 | S3I(s)->renegotiate = 0; |
2709 | S3I(s)->num_renegotiations++; | 2709 | S3I(s)->num_renegotiations++; |
2710 | S3I(s)->total_renegotiations++; | 2710 | S3I(s)->total_renegotiations++; |