summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls13_client.c
diff options
context:
space:
mode:
authorjsing <>2019-02-14 17:55:32 +0000
committerjsing <>2019-02-14 17:55:32 +0000
commit8c68aef4e0aa566d8a1520b78e3e2ada556815fb (patch)
tree8d33d71ecb17eab8b569e6964abf8e5bd7fb0729 /src/lib/libssl/tls13_client.c
parent32f29b79bba51350a105bc00734a01f2ec6ea051 (diff)
downloadopenbsd-8c68aef4e0aa566d8a1520b78e3e2ada556815fb.tar.gz
openbsd-8c68aef4e0aa566d8a1520b78e3e2ada556815fb.tar.bz2
openbsd-8c68aef4e0aa566d8a1520b78e3e2ada556815fb.zip
Split tls13_record_layer_set_traffic_keys() into two separate functions.
This allows the read traffic key to be set independently of the write traffic key. This will become necessary for KeyUpdate handling, however also allows for switching to application traffic keys at more appropriate stages of the handshake. ok tb@
Diffstat (limited to 'src/lib/libssl/tls13_client.c')
-rw-r--r--src/lib/libssl/tls13_client.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/libssl/tls13_client.c b/src/lib/libssl/tls13_client.c
index c8345f3a36..5353b5a3c8 100644
--- a/src/lib/libssl/tls13_client.c
+++ b/src/lib/libssl/tls13_client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_client.c,v 1.8 2019/02/13 16:29:18 jsing Exp $ */ 1/* $OpenBSD: tls13_client.c,v 1.9 2019/02/14 17:55:31 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -308,8 +308,10 @@ tls13_server_hello_recv(struct tls13_ctx *ctx)
308 tls13_record_layer_set_aead(ctx->rl, ctx->aead); 308 tls13_record_layer_set_aead(ctx->rl, ctx->aead);
309 tls13_record_layer_set_hash(ctx->rl, ctx->hash); 309 tls13_record_layer_set_hash(ctx->rl, ctx->hash);
310 310
311 if (!tls13_record_layer_set_traffic_keys(ctx->rl, 311 if (!tls13_record_layer_set_read_traffic_key(ctx->rl,
312 &secrets->server_handshake_traffic, 312 &secrets->server_handshake_traffic))
313 goto err;
314 if (!tls13_record_layer_set_write_traffic_key(ctx->rl,
313 &secrets->client_handshake_traffic)) 315 &secrets->client_handshake_traffic))
314 goto err; 316 goto err;
315 317