diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_pkt.c | 11 | 
1 files changed, 2 insertions, 9 deletions
| diff --git a/src/lib/libssl/ssl_pkt.c b/src/lib/libssl/ssl_pkt.c index 6e0cfe2102..ba59aa3237 100644 --- a/src/lib/libssl/ssl_pkt.c +++ b/src/lib/libssl/ssl_pkt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_pkt.c,v 1.41 2021/04/25 13:15:22 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_pkt.c,v 1.42 2021/05/02 17:46:58 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 | * | 
| @@ -1154,8 +1154,6 @@ ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek) | |||
| 1154 | int | 1154 | int | 
| 1155 | ssl3_do_change_cipher_spec(SSL *s) | 1155 | ssl3_do_change_cipher_spec(SSL *s) | 
| 1156 | { | 1156 | { | 
| 1157 | int i; | ||
| 1158 | |||
| 1159 | if (S3I(s)->hs.tls12.key_block == NULL) { | 1157 | if (S3I(s)->hs.tls12.key_block == NULL) { | 
| 1160 | if (s->session == NULL || s->session->master_key_length == 0) { | 1158 | if (s->session == NULL || s->session->master_key_length == 0) { | 
| 1161 | /* might happen if dtls1_read_bytes() calls this */ | 1159 | /* might happen if dtls1_read_bytes() calls this */ | 
| @@ -1168,12 +1166,7 @@ ssl3_do_change_cipher_spec(SSL *s) | |||
| 1168 | return (0); | 1166 | return (0); | 
| 1169 | } | 1167 | } | 
| 1170 | 1168 | ||
| 1171 | if (S3I(s)->hs.state & SSL_ST_ACCEPT) | 1169 | if (!tls1_change_read_cipher_state(s)) | 
| 1172 | i = SSL3_CHANGE_CIPHER_SERVER_READ; | ||
| 1173 | else | ||
| 1174 | i = SSL3_CHANGE_CIPHER_CLIENT_READ; | ||
| 1175 | |||
| 1176 | if (!tls1_change_cipher_state(s, i)) | ||
| 1177 | return (0); | 1170 | return (0); | 
| 1178 | 1171 | ||
| 1179 | /* | 1172 | /* | 
