summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2020-03-10 17:23:25 +0000
committerjsing <>2020-03-10 17:23:25 +0000
commite0c848b5bda852697d7b956ff1f7b8eb68b7ad18 (patch)
treeab4e7751aba425ddcef98a8235871f6ca403b80c /src
parent027d2fe8fdfda6e9b58167dbb850dfd6aeb48495 (diff)
downloadopenbsd-e0c848b5bda852697d7b956ff1f7b8eb68b7ad18.tar.gz
openbsd-e0c848b5bda852697d7b956ff1f7b8eb68b7ad18.tar.bz2
openbsd-e0c848b5bda852697d7b956ff1f7b8eb68b7ad18.zip
Use ctx->hs->secrets rather than the S3I(s) version.
ok inoguchi@ tb@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/tls13_client.c4
-rw-r--r--src/lib/libssl/tls13_server.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/tls13_client.c b/src/lib/libssl/tls13_client.c
index 1c9debc4e5..078730111a 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.45 2020/02/23 17:51:36 tb Exp $ */ 1/* $OpenBSD: tls13_client.c,v 1.46 2020/03/10 17:23:25 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 *
@@ -471,7 +471,7 @@ tls13_client_engage_record_protection(struct tls13_ctx *ctx)
471 471
472 if ((secrets = tls13_secrets_create(ctx->hash, 0)) == NULL) 472 if ((secrets = tls13_secrets_create(ctx->hash, 0)) == NULL)
473 goto err; 473 goto err;
474 S3I(ctx->ssl)->hs_tls13.secrets = secrets; 474 ctx->hs->secrets = secrets;
475 475
476 /* XXX - pass in hash. */ 476 /* XXX - pass in hash. */
477 if (!tls1_transcript_hash_init(s)) 477 if (!tls1_transcript_hash_init(s))
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c
index edffd45239..3b170f9370 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.27 2020/03/10 17:15:02 jsing Exp $ */ 1/* $OpenBSD: tls13_server.c,v 1.28 2020/03/10 17:23:25 jsing 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>
@@ -561,7 +561,7 @@ tls13_server_hello_sent(struct tls13_ctx *ctx)
561 561
562 if ((secrets = tls13_secrets_create(ctx->hash, 0)) == NULL) 562 if ((secrets = tls13_secrets_create(ctx->hash, 0)) == NULL)
563 goto err; 563 goto err;
564 S3I(ctx->ssl)->hs_tls13.secrets = secrets; 564 ctx->hs->secrets = secrets;
565 565
566 /* XXX - pass in hash. */ 566 /* XXX - pass in hash. */
567 if (!tls1_transcript_hash_init(s)) 567 if (!tls1_transcript_hash_init(s))