From 9507004da76db0b4a0cef78dcdb9e35596e20f68 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Thu, 14 Feb 2019 17:55:32 +0000 Subject: 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@ --- src/lib/libssl/tls13_client.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/lib/libssl/tls13_client.c') 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 @@ -/* $OpenBSD: tls13_client.c,v 1.8 2019/02/13 16:29:18 jsing Exp $ */ +/* $OpenBSD: tls13_client.c,v 1.9 2019/02/14 17:55:31 jsing Exp $ */ /* * Copyright (c) 2018, 2019 Joel Sing * @@ -308,8 +308,10 @@ tls13_server_hello_recv(struct tls13_ctx *ctx) tls13_record_layer_set_aead(ctx->rl, ctx->aead); tls13_record_layer_set_hash(ctx->rl, ctx->hash); - if (!tls13_record_layer_set_traffic_keys(ctx->rl, - &secrets->server_handshake_traffic, + if (!tls13_record_layer_set_read_traffic_key(ctx->rl, + &secrets->server_handshake_traffic)) + goto err; + if (!tls13_record_layer_set_write_traffic_key(ctx->rl, &secrets->client_handshake_traffic)) goto err; -- cgit v1.2.3-55-g6feb