Rename tls13_key_share to tls_key_share.

In preparation to use the key share code in both the TLSv1.3 and legacy
stacks, rename tls13_key_share to tls_key_share, moving it into the shared
handshake struct. Further changes will then allow the legacy stack to make
use of the same code for ephemeral key exchange.

ok inoguchi@ tb@

1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c
index f5066f958a..739ef06609 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.89 2021/12/26 14:59:52 jsing Exp $ */
+/* $OpenBSD: tls13_server.c,v 1.90 2022/01/05 17:10:02 jsing Exp $ */
 /*
  * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
@@ -295,7 +295,7 @@ tls13_client_hello_recv(struct tls13_ctx *ctx, CBS *cbs)
          * has been enabled. This would probably mean using either an
          * INITIAL | WITHOUT_HRR state, or another intermediate state.
          */
-        if (ctx->hs->tls13.key_share != NULL)
+        if (ctx->hs->key_share != NULL)
                 ctx->handshake_stage.hs_type |= NEGOTIATED | WITHOUT_HRR;
 
         /* XXX - check this is the correct point */
@@ -360,7 +360,7 @@ tls13_server_engage_record_protection(struct tls13_ctx *ctx)
         SSL *s = ctx->ssl;
         int ret = 0;
 
-        if (!tls13_key_share_derive(ctx->hs->tls13.key_share,
+        if (!tls_key_share_derive(ctx->hs->key_share,
             &shared_key, &shared_key_len))
                 goto err;
 
@@ -425,7 +425,7 @@ tls13_server_hello_retry_request_send(struct tls13_ctx *ctx, CBB *cbb)
         if (!tls13_synthetic_handshake_message(ctx))
                 return 0;
 
-        if (ctx->hs->tls13.key_share != NULL)
+        if (ctx->hs->key_share != NULL)
                 return 0;
         if ((nid = tls1_get_shared_curve(ctx->ssl)) == NID_undef)
                 return 0;
@@ -485,9 +485,9 @@ tls13_servername_process(struct tls13_ctx *ctx)
 int
 tls13_server_hello_send(struct tls13_ctx *ctx, CBB *cbb)
 {
-        if (ctx->hs->tls13.key_share == NULL)
+        if (ctx->hs->key_share == NULL)
                 return 0;
-        if (!tls13_key_share_generate(ctx->hs->tls13.key_share))
+        if (!tls_key_share_generate(ctx->hs->key_share))
                 return 0;
         if (!tls13_servername_process(ctx))
                 return 0;