summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_pkt.c
diff options
context:
space:
mode:
authorjsing <>2021-03-24 18:40:03 +0000
committerjsing <>2021-03-24 18:40:03 +0000
commit3ce9712d99b47c9a9db840f6cf8cc970a5f841dd (patch)
tree11571c197cb39ad7863008ce9cfde68d93e4365c /src/lib/libssl/ssl_pkt.c
parentfe982f909e3eb95563da8f33820ff38d44f1179f (diff)
downloadopenbsd-3ce9712d99b47c9a9db840f6cf8cc970a5f841dd.tar.gz
openbsd-3ce9712d99b47c9a9db840f6cf8cc970a5f841dd.tar.bz2
openbsd-3ce9712d99b47c9a9db840f6cf8cc970a5f841dd.zip
Add SSL_HANDSHAKE_TLS12 for TLSv1.2 specific handshake data.
Move TLSv1.2 specific components over from SSL_HANDSHAKE. ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_pkt.c')
-rw-r--r--src/lib/libssl/ssl_pkt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_pkt.c b/src/lib/libssl/ssl_pkt.c
index 5b1af504fb..37bee9e69f 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.37 2021/03/10 18:27:02 jsing Exp $ */ 1/* $OpenBSD: ssl_pkt.c,v 1.38 2021/03/24 18:40:03 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 *
@@ -1163,7 +1163,7 @@ ssl3_do_change_cipher_spec(SSL *s)
1163 else 1163 else
1164 i = SSL3_CHANGE_CIPHER_CLIENT_READ; 1164 i = SSL3_CHANGE_CIPHER_CLIENT_READ;
1165 1165
1166 if (S3I(s)->hs.key_block == NULL) { 1166 if (S3I(s)->hs.tls12.key_block == NULL) {
1167 if (s->session == NULL || s->session->master_key_length == 0) { 1167 if (s->session == NULL || s->session->master_key_length == 0) {
1168 /* might happen if dtls1_read_bytes() calls this */ 1168 /* might happen if dtls1_read_bytes() calls this */
1169 SSLerror(s, SSL_R_CCS_RECEIVED_EARLY); 1169 SSLerror(s, SSL_R_CCS_RECEIVED_EARLY);