diff options
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
| -rw-r--r-- | src/lib/libssl/s3_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 6774557756..09af18ea95 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.125 2017/01/23 06:45:30 beck Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.126 2017/01/23 08:48:44 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 | * |
| @@ -1678,7 +1678,7 @@ ssl3_cipher_get_value(const SSL_CIPHER *c) | |||
| 1678 | int | 1678 | int |
| 1679 | ssl3_pending(const SSL *s) | 1679 | ssl3_pending(const SSL *s) |
| 1680 | { | 1680 | { |
| 1681 | if (s->rstate == SSL_ST_READ_BODY) | 1681 | if (s->internal->rstate == SSL_ST_READ_BODY) |
| 1682 | return 0; | 1682 | return 0; |
| 1683 | 1683 | ||
| 1684 | return (S3I(s)->rrec.type == SSL3_RT_APPLICATION_DATA) ? | 1684 | return (S3I(s)->rrec.type == SSL3_RT_APPLICATION_DATA) ? |
| @@ -2505,7 +2505,7 @@ ssl3_shutdown(SSL *s) | |||
| 2505 | * Don't do anything much if we have not done the handshake or | 2505 | * Don't do anything much if we have not done the handshake or |
| 2506 | * we don't want to send messages :-) | 2506 | * we don't want to send messages :-) |
| 2507 | */ | 2507 | */ |
| 2508 | if ((s->internal->quiet_shutdown) || (s->state == SSL_ST_BEFORE)) { | 2508 | if ((s->internal->quiet_shutdown) || (s->internal->state == SSL_ST_BEFORE)) { |
| 2509 | s->internal->shutdown = (SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN); | 2509 | s->internal->shutdown = (SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN); |
| 2510 | return (1); | 2510 | return (1); |
| 2511 | } | 2511 | } |
| @@ -2669,7 +2669,7 @@ ssl3_renegotiate_check(SSL *s) | |||
| 2669 | * to SSL_ST_ACCEPT. | 2669 | * to SSL_ST_ACCEPT. |
| 2670 | */ | 2670 | */ |
| 2671 | /* SSL_ST_ACCEPT */ | 2671 | /* SSL_ST_ACCEPT */ |
| 2672 | s->state = SSL_ST_RENEGOTIATE; | 2672 | s->internal->state = SSL_ST_RENEGOTIATE; |
| 2673 | S3I(s)->renegotiate = 0; | 2673 | S3I(s)->renegotiate = 0; |
| 2674 | S3I(s)->num_renegotiations++; | 2674 | S3I(s)->num_renegotiations++; |
| 2675 | S3I(s)->total_renegotiations++; | 2675 | S3I(s)->total_renegotiations++; |
