diff options
Diffstat (limited to 'src/lib/libssl/tls13_client.c')
-rw-r--r-- | src/lib/libssl/tls13_client.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/tls13_client.c b/src/lib/libssl/tls13_client.c index 25d78d1332..1f51748147 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.69 2021/01/05 17:32:39 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_client.c,v 1.70 2021/01/06 20:15:35 tb 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 | * |
@@ -1034,10 +1034,9 @@ tls13_client_finished_send(struct tls13_ctx *ctx, CBB *cbb) | |||
1034 | { | 1034 | { |
1035 | struct tls13_secrets *secrets = ctx->hs->secrets; | 1035 | struct tls13_secrets *secrets = ctx->hs->secrets; |
1036 | struct tls13_secret context = { .data = "", .len = 0 }; | 1036 | struct tls13_secret context = { .data = "", .len = 0 }; |
1037 | struct tls13_secret finished_key; | 1037 | struct tls13_secret finished_key = { .data = NULL, .len = 0 }; |
1038 | uint8_t transcript_hash[EVP_MAX_MD_SIZE]; | 1038 | uint8_t transcript_hash[EVP_MAX_MD_SIZE]; |
1039 | size_t transcript_hash_len; | 1039 | size_t transcript_hash_len; |
1040 | uint8_t key[EVP_MAX_MD_SIZE]; | ||
1041 | uint8_t *verify_data; | 1040 | uint8_t *verify_data; |
1042 | size_t verify_data_len; | 1041 | size_t verify_data_len; |
1043 | unsigned int hlen; | 1042 | unsigned int hlen; |
@@ -1046,8 +1045,8 @@ tls13_client_finished_send(struct tls13_ctx *ctx, CBB *cbb) | |||
1046 | SSL *s = ctx->ssl; | 1045 | SSL *s = ctx->ssl; |
1047 | int ret = 0; | 1046 | int ret = 0; |
1048 | 1047 | ||
1049 | finished_key.data = key; | 1048 | if (!tls13_secret_init(&finished_key, EVP_MD_size(ctx->hash))) |
1050 | finished_key.len = EVP_MD_size(ctx->hash); | 1049 | goto err; |
1051 | 1050 | ||
1052 | if (!tls13_hkdf_expand_label(&finished_key, ctx->hash, | 1051 | if (!tls13_hkdf_expand_label(&finished_key, ctx->hash, |
1053 | &secrets->client_handshake_traffic, "finished", | 1052 | &secrets->client_handshake_traffic, "finished", |
@@ -1082,6 +1081,7 @@ tls13_client_finished_send(struct tls13_ctx *ctx, CBB *cbb) | |||
1082 | ret = 1; | 1081 | ret = 1; |
1083 | 1082 | ||
1084 | err: | 1083 | err: |
1084 | tls13_secret_cleanup(&finished_key); | ||
1085 | HMAC_CTX_free(hmac_ctx); | 1085 | HMAC_CTX_free(hmac_ctx); |
1086 | 1086 | ||
1087 | return ret; | 1087 | return ret; |