1 files changed, 17 insertions, 17 deletions

diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index 3dc87a00c8..047087c1c9 100644
--- a/src/lib/libssl/ssl_srvr.c
+++ b/src/lib/libssl/ssl_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_srvr.c,v 1.98 2021/03/24 18:40:03 jsing Exp $ */
+/* $OpenBSD: ssl_srvr.c,v 1.99 2021/03/24 18:44:00 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -394,7 +394,7 @@ ssl3_accept(SSL *s)
                 case SSL3_ST_SW_CERT_A:
                 case SSL3_ST_SW_CERT_B:
                         /* Check if it is anon DH or anon ECDH. */
-                        if (!(S3I(s)->hs.new_cipher->algorithm_auth &
+                        if (!(S3I(s)->hs.cipher->algorithm_auth &
                             SSL_aNULL)) {
                                 if (SSL_is_dtls(s))
                                         dtls1_start_timer(s);
@@ -414,7 +414,7 @@ ssl3_accept(SSL *s)
 
                 case SSL3_ST_SW_KEY_EXCH_A:
                 case SSL3_ST_SW_KEY_EXCH_B:
-                        alg_k = S3I(s)->hs.new_cipher->algorithm_mkey;
+                        alg_k = S3I(s)->hs.cipher->algorithm_mkey;
 
                         /*
                          * Only send if using a DH key exchange.
@@ -459,7 +459,7 @@ ssl3_accept(SSL *s)
                         if (!(s->verify_mode & SSL_VERIFY_PEER) ||
                             ((s->session->peer != NULL) &&
                              (s->verify_mode & SSL_VERIFY_CLIENT_ONCE)) ||
-                            ((S3I(s)->hs.new_cipher->algorithm_auth &
+                            ((S3I(s)->hs.cipher->algorithm_auth &
                              SSL_aNULL) && !(s->verify_mode &
                              SSL_VERIFY_FAIL_IF_NO_PEER_CERT))) {
                                 /* No cert request. */
@@ -542,7 +542,7 @@ ssl3_accept(SSL *s)
                                 s->internal->init_num = 0;
                         }
 
-                        alg_k = S3I(s)->hs.new_cipher->algorithm_mkey;
+                        alg_k = S3I(s)->hs.cipher->algorithm_mkey;
                         if (ret == 2) {
                                 /*
                                  * For the ECDH ciphersuites when
@@ -641,7 +641,7 @@ ssl3_accept(SSL *s)
 
                 case SSL3_ST_SW_CHANGE_A:
                 case SSL3_ST_SW_CHANGE_B:
-                        s->session->cipher = S3I(s)->hs.new_cipher;
+                        s->session->cipher = S3I(s)->hs.cipher;
                         if (!tls1_setup_key_block(s)) {
                                 ret = -1;
                                 goto end;
@@ -1122,15 +1122,15 @@ ssl3_get_client_hello(SSL *s)
                         SSLerror(s, SSL_R_NO_SHARED_CIPHER);
                         goto fatal_err;
                 }
-                S3I(s)->hs.new_cipher = c;
+                S3I(s)->hs.cipher = c;
         } else {
-                S3I(s)->hs.new_cipher = s->session->cipher;
+                S3I(s)->hs.cipher = s->session->cipher;
         }
 
         if (!tls1_transcript_hash_init(s))
                 goto err;
 
-        alg_k = S3I(s)->hs.new_cipher->algorithm_mkey;
+        alg_k = S3I(s)->hs.cipher->algorithm_mkey;
         if (!(SSL_USE_SIGALGS(s) || (alg_k & SSL_kGOST)) ||
             !(s->verify_mode & SSL_VERIFY_PEER))
                 tls1_transcript_free(s);
@@ -1144,7 +1144,7 @@ ssl3_get_client_hello(SSL *s)
          * ssl version is set   - sslv3
          * s->session           - The ssl session has been setup.
          * s->internal->hit             - session reuse flag
-         * s->hs.new_cipher     - the new cipher to use.
+         * s->hs.cipher - the new cipher to use.
          */
 
         /* Handles TLS extensions that we couldn't check earlier */
@@ -1265,7 +1265,7 @@ ssl3_send_server_hello(SSL *s)
 
                 /* Cipher suite. */
                 if (!CBB_add_u16(&server_hello,
-                    ssl3_cipher_get_value(S3I(s)->hs.new_cipher)))
+                    ssl3_cipher_get_value(S3I(s)->hs.cipher)))
                         goto err;
 
                 /* Compression method (null). */
@@ -1336,7 +1336,7 @@ ssl3_send_server_kex_dhe(SSL *s, CBB *cbb)
 
         if (dhp == NULL && s->cert->dh_tmp_cb != NULL)
                 dhp = s->cert->dh_tmp_cb(s, 0,
-                    SSL_C_PKEYLENGTH(S3I(s)->hs.new_cipher));
+                    SSL_C_PKEYLENGTH(S3I(s)->hs.cipher));
 
         if (dhp == NULL) {
                 al = SSL_AD_HANDSHAKE_FAILURE;
@@ -1544,7 +1544,7 @@ ssl3_send_server_key_exchange(SSL *s)
                 if (!CBB_init(&cbb_params, 0))
                         goto err;
 
-                type = S3I(s)->hs.new_cipher->algorithm_mkey;
+                type = S3I(s)->hs.cipher->algorithm_mkey;
                 if (type & SSL_kDHE) {
                         if (ssl3_send_server_kex_dhe(s, &cbb_params) != 1)
                                 goto err;
@@ -1564,8 +1564,8 @@ ssl3_send_server_key_exchange(SSL *s)
                         goto err;
 
                 /* Add signature unless anonymous. */
-                if (!(S3I(s)->hs.new_cipher->algorithm_auth & SSL_aNULL)) {
-                        if ((pkey = ssl_get_sign_pkey(s, S3I(s)->hs.new_cipher,
+                if (!(S3I(s)->hs.cipher->algorithm_auth & SSL_aNULL)) {
+                        if ((pkey = ssl_get_sign_pkey(s, S3I(s)->hs.cipher,
                             &md, &sigalg)) == NULL) {
                                 al = SSL_AD_DECODE_ERROR;
                                 goto fatal_err;
@@ -2002,7 +2002,7 @@ ssl3_get_client_kex_gost(SSL *s, CBS *cbs)
         int ret = 0;
 
         /* Get our certificate private key*/
-        alg_a = S3I(s)->hs.new_cipher->algorithm_auth;
+        alg_a = S3I(s)->hs.cipher->algorithm_auth;
         if (alg_a & SSL_aGOST01)
                 pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey;
 
@@ -2081,7 +2081,7 @@ ssl3_get_client_key_exchange(SSL *s)
 
         CBS_init(&cbs, s->internal->init_msg, n);
 
-        alg_k = S3I(s)->hs.new_cipher->algorithm_mkey;
+        alg_k = S3I(s)->hs.cipher->algorithm_mkey;
 
         if (alg_k & SSL_kRSA) {
                 if (ssl3_get_client_kex_rsa(s, &cbs) != 1)