diff options
Diffstat (limited to 'src/lib/libssl/tls13_client.c')
-rw-r--r-- | src/lib/libssl/tls13_client.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/libssl/tls13_client.c b/src/lib/libssl/tls13_client.c index 78bf15ec59..e0febee926 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.76 2021/03/24 18:44:00 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_client.c,v 1.77 2021/03/29 16:46:09 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 | * |
@@ -746,7 +746,6 @@ tls13_server_finished_recv(struct tls13_ctx *ctx, CBS *cbs) | |||
746 | uint8_t key[EVP_MAX_MD_SIZE]; | 746 | uint8_t key[EVP_MAX_MD_SIZE]; |
747 | HMAC_CTX *hmac_ctx = NULL; | 747 | HMAC_CTX *hmac_ctx = NULL; |
748 | unsigned int hlen; | 748 | unsigned int hlen; |
749 | SSL *s = ctx->ssl; | ||
750 | int ret = 0; | 749 | int ret = 0; |
751 | 750 | ||
752 | /* | 751 | /* |
@@ -781,9 +780,9 @@ tls13_server_finished_recv(struct tls13_ctx *ctx, CBS *cbs) | |||
781 | goto err; | 780 | goto err; |
782 | } | 781 | } |
783 | 782 | ||
784 | if (!CBS_write_bytes(cbs, S3I(s)->tmp.peer_finish_md, | 783 | if (!CBS_write_bytes(cbs, ctx->hs->peer_finished, |
785 | sizeof(S3I(s)->tmp.peer_finish_md), | 784 | sizeof(ctx->hs->peer_finished), |
786 | &S3I(s)->tmp.peer_finish_md_len)) | 785 | &ctx->hs->peer_finished_len)) |
787 | goto err; | 786 | goto err; |
788 | 787 | ||
789 | if (!CBS_skip(cbs, verify_data_len)) | 788 | if (!CBS_skip(cbs, verify_data_len)) |
@@ -1032,7 +1031,6 @@ tls13_client_finished_send(struct tls13_ctx *ctx, CBB *cbb) | |||
1032 | unsigned int hlen; | 1031 | unsigned int hlen; |
1033 | HMAC_CTX *hmac_ctx = NULL; | 1032 | HMAC_CTX *hmac_ctx = NULL; |
1034 | CBS cbs; | 1033 | CBS cbs; |
1035 | SSL *s = ctx->ssl; | ||
1036 | int ret = 0; | 1034 | int ret = 0; |
1037 | 1035 | ||
1038 | if (!tls13_secret_init(&finished_key, EVP_MD_size(ctx->hash))) | 1036 | if (!tls13_secret_init(&finished_key, EVP_MD_size(ctx->hash))) |
@@ -1064,8 +1062,8 @@ tls13_client_finished_send(struct tls13_ctx *ctx, CBB *cbb) | |||
1064 | goto err; | 1062 | goto err; |
1065 | 1063 | ||
1066 | CBS_init(&cbs, verify_data, verify_data_len); | 1064 | CBS_init(&cbs, verify_data, verify_data_len); |
1067 | if (!CBS_write_bytes(&cbs, S3I(s)->tmp.finish_md, | 1065 | if (!CBS_write_bytes(&cbs, ctx->hs->finished, |
1068 | sizeof(S3I(s)->tmp.finish_md), &S3I(s)->tmp.finish_md_len)) | 1066 | sizeof(ctx->hs->finished), &ctx->hs->finished_len)) |
1069 | goto err; | 1067 | goto err; |
1070 | 1068 | ||
1071 | ret = 1; | 1069 | ret = 1; |