Rename new_cipher to cipher.

This is in the SSL_HANDSHAKE struct and is what we're currently
negotiating, so there is really nothing more "new" about the cipher
than there is the key block or other parts of the handshake data.

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 658aef2cfe..bac9623a15 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.72 2021/03/21 18:36:34 jsing Exp $ */
+/* $OpenBSD: tls13_server.c,v 1.73 2021/03/24 18:44:00 jsing Exp $ */
 /*
  * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
@@ -249,7 +249,7 @@ tls13_client_hello_process(struct tls13_ctx *ctx, CBS *cbs)
                 ctx->alert = TLS13_ALERT_HANDSHAKE_FAILURE;
                 goto err;
         }
-        ctx->hs->new_cipher = cipher;
+        ctx->hs->cipher = cipher;
 
         sk_SSL_CIPHER_free(s->session->ciphers);
         s->session->ciphers = ciphers;
@@ -314,7 +314,7 @@ tls13_server_hello_build(struct tls13_ctx *ctx, CBB *cbb, int hrr)
         SSL *s = ctx->ssl;
         uint16_t cipher;
 
-        cipher = SSL_CIPHER_get_value(ctx->hs->new_cipher);
+        cipher = SSL_CIPHER_get_value(ctx->hs->cipher);
         server_random = s->s3->server_random;
 
         if (hrr) {
@@ -362,11 +362,11 @@ tls13_server_engage_record_protection(struct tls13_ctx *ctx)
             &shared_key, &shared_key_len))
                 goto err;
 
-        s->session->cipher = ctx->hs->new_cipher;
+        s->session->cipher = ctx->hs->cipher;
 
-        if ((ctx->aead = tls13_cipher_aead(ctx->hs->new_cipher)) == NULL)
+        if ((ctx->aead = tls13_cipher_aead(ctx->hs->cipher)) == NULL)
                 goto err;
-        if ((ctx->hash = tls13_cipher_hash(ctx->hs->new_cipher)) == NULL)
+        if ((ctx->hash = tls13_cipher_hash(ctx->hs->cipher)) == NULL)
                 goto err;
 
         if ((secrets = tls13_secrets_create(ctx->hash, 0)) == NULL)