summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls13_server.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/tls13_server.c')
-rw-r--r--src/lib/libssl/tls13_server.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c
index 9e5664b79a..f929e132a8 100644
--- a/src/lib/libssl/tls13_server.c
+++ b/src/lib/libssl/tls13_server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_server.c,v 1.66 2021/01/05 17:32:39 jsing Exp $ */ 1/* $OpenBSD: tls13_server.c,v 1.67 2021/01/06 20:15:35 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2020 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
@@ -770,10 +770,9 @@ tls13_server_finished_send(struct tls13_ctx *ctx, CBB *cbb)
770{ 770{
771 struct tls13_secrets *secrets = ctx->hs->secrets; 771 struct tls13_secrets *secrets = ctx->hs->secrets;
772 struct tls13_secret context = { .data = "", .len = 0 }; 772 struct tls13_secret context = { .data = "", .len = 0 };
773 struct tls13_secret finished_key; 773 struct tls13_secret finished_key = { .data = NULL, .len = 0 } ;
774 uint8_t transcript_hash[EVP_MAX_MD_SIZE]; 774 uint8_t transcript_hash[EVP_MAX_MD_SIZE];
775 size_t transcript_hash_len; 775 size_t transcript_hash_len;
776 uint8_t key[EVP_MAX_MD_SIZE];
777 uint8_t *verify_data; 776 uint8_t *verify_data;
778 size_t verify_data_len; 777 size_t verify_data_len;
779 unsigned int hlen; 778 unsigned int hlen;
@@ -782,8 +781,8 @@ tls13_server_finished_send(struct tls13_ctx *ctx, CBB *cbb)
782 SSL *s = ctx->ssl; 781 SSL *s = ctx->ssl;
783 int ret = 0; 782 int ret = 0;
784 783
785 finished_key.data = key; 784 if (!tls13_secret_init(&finished_key, EVP_MD_size(ctx->hash)))
786 finished_key.len = EVP_MD_size(ctx->hash); 785 goto err;
787 786
788 if (!tls13_hkdf_expand_label(&finished_key, ctx->hash, 787 if (!tls13_hkdf_expand_label(&finished_key, ctx->hash,
789 &secrets->server_handshake_traffic, "finished", 788 &secrets->server_handshake_traffic, "finished",
@@ -818,6 +817,7 @@ tls13_server_finished_send(struct tls13_ctx *ctx, CBB *cbb)
818 ret = 1; 817 ret = 1;
819 818
820 err: 819 err:
820 tls13_secret_cleanup(&finished_key);
821 HMAC_CTX_free(hmac_ctx); 821 HMAC_CTX_free(hmac_ctx);
822 822
823 return ret; 823 return ret;