From e0c848b5bda852697d7b956ff1f7b8eb68b7ad18 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Tue, 10 Mar 2020 17:23:25 +0000 Subject: Use ctx->hs->secrets rather than the S3I(s) version. ok inoguchi@ tb@ --- src/lib/libssl/tls13_client.c | 4 ++-- src/lib/libssl/tls13_server.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib') 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 @@ -/* $OpenBSD: tls13_client.c,v 1.45 2020/02/23 17:51:36 tb Exp $ */ +/* $OpenBSD: tls13_client.c,v 1.46 2020/03/10 17:23:25 jsing Exp $ */ /* * Copyright (c) 2018, 2019 Joel Sing * @@ -471,7 +471,7 @@ tls13_client_engage_record_protection(struct tls13_ctx *ctx) if ((secrets = tls13_secrets_create(ctx->hash, 0)) == NULL) goto err; - S3I(ctx->ssl)->hs_tls13.secrets = secrets; + ctx->hs->secrets = secrets; /* XXX - pass in hash. */ 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 @@ -/* $OpenBSD: tls13_server.c,v 1.27 2020/03/10 17:15:02 jsing Exp $ */ +/* $OpenBSD: tls13_server.c,v 1.28 2020/03/10 17:23:25 jsing Exp $ */ /* * Copyright (c) 2019, 2020 Joel Sing * Copyright (c) 2020 Bob Beck @@ -561,7 +561,7 @@ tls13_server_hello_sent(struct tls13_ctx *ctx) if ((secrets = tls13_secrets_create(ctx->hash, 0)) == NULL) goto err; - S3I(ctx->ssl)->hs_tls13.secrets = secrets; + ctx->hs->secrets = secrets; /* XXX - pass in hash. */ if (!tls1_transcript_hash_init(s)) -- cgit v1.2.3-55-g6feb