summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_pkt.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_pkt.c')
-rw-r--r--src/lib/libssl/ssl_pkt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_pkt.c b/src/lib/libssl/ssl_pkt.c
index 37bee9e69f..a93acdfa7f 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.38 2021/03/24 18:40:03 jsing Exp $ */ 1/* $OpenBSD: ssl_pkt.c,v 1.39 2021/03/24 18:44:00 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 *
@@ -1038,7 +1038,7 @@ ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
1038 } 1038 }
1039 1039
1040 /* Check we have a cipher to change to */ 1040 /* Check we have a cipher to change to */
1041 if (S3I(s)->hs.new_cipher == NULL) { 1041 if (S3I(s)->hs.cipher == NULL) {
1042 al = SSL_AD_UNEXPECTED_MESSAGE; 1042 al = SSL_AD_UNEXPECTED_MESSAGE;
1043 SSLerror(s, SSL_R_CCS_RECEIVED_EARLY); 1043 SSLerror(s, SSL_R_CCS_RECEIVED_EARLY);
1044 goto fatal_err; 1044 goto fatal_err;
@@ -1170,7 +1170,7 @@ ssl3_do_change_cipher_spec(SSL *s)
1170 return (0); 1170 return (0);
1171 } 1171 }
1172 1172
1173 s->session->cipher = S3I(s)->hs.new_cipher; 1173 s->session->cipher = S3I(s)->hs.cipher;
1174 if (!tls1_setup_key_block(s)) 1174 if (!tls1_setup_key_block(s))
1175 return (0); 1175 return (0);
1176 } 1176 }