summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls13_handshake.c
diff options
context:
space:
mode:
authorjsing <>2020-01-24 04:43:09 +0000
committerjsing <>2020-01-24 04:43:09 +0000
commit7d0ccc6a48e8176d58137096648f349ab3a1deb9 (patch)
treef271583fde3bbe55c9242508f9c0faa3bde9978d /src/lib/libssl/tls13_handshake.c
parent44f0fba669fd627fb05c843a0e2ade9b80701e87 (diff)
downloadopenbsd-7d0ccc6a48e8176d58137096648f349ab3a1deb9.tar.gz
openbsd-7d0ccc6a48e8176d58137096648f349ab3a1deb9.tar.bz2
openbsd-7d0ccc6a48e8176d58137096648f349ab3a1deb9.zip
Switch to encrypted records in the TLSv1.3 server.
This adds code to perform key derivation and set the traffic keys once the ServerHello message has been sent, enabling encrypted records. ok beck@ tb@
Diffstat (limited to 'src/lib/libssl/tls13_handshake.c')
-rw-r--r--src/lib/libssl/tls13_handshake.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/tls13_handshake.c b/src/lib/libssl/tls13_handshake.c
index 1157d6ecac..518073f4a1 100644
--- a/src/lib/libssl/tls13_handshake.c
+++ b/src/lib/libssl/tls13_handshake.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_handshake.c,v 1.41 2020/01/23 02:24:38 jsing Exp $ */ 1/* $OpenBSD: tls13_handshake.c,v 1.42 2020/01/24 04:43:09 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2018-2019 Theo Buehler <tb@openbsd.org> 3 * Copyright (c) 2018-2019 Theo Buehler <tb@openbsd.org>
4 * Copyright (c) 2019 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2019 Joel Sing <jsing@openbsd.org>
@@ -97,6 +97,7 @@ struct tls13_handshake_action state_machine[] = {
97 .handshake_type = TLS13_MT_SERVER_HELLO, 97 .handshake_type = TLS13_MT_SERVER_HELLO,
98 .sender = TLS13_HS_SERVER, 98 .sender = TLS13_HS_SERVER,
99 .send = tls13_server_hello_send, 99 .send = tls13_server_hello_send,
100 .sent = tls13_server_hello_sent,
100 .recv = tls13_server_hello_recv, 101 .recv = tls13_server_hello_recv,
101 }, 102 },
102 [SERVER_HELLO_RETRY] = { 103 [SERVER_HELLO_RETRY] = {