summaryrefslogtreecommitdiff
path: root/lib/libssl/t1_enc.c
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2021-03-24 18:44:01 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2021-03-24 18:44:01 +0000
commitf635f248c8436d983e9c88e6ee71f2d936b4c3fd (patch)
tree6af3444908ee4fc69f0737fa0a3dd1030eabe693 /lib/libssl/t1_enc.c
parentb0ed34bb3747533bf0286779b2dbe48eaf1a77c1 (diff)
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@
Diffstat (limited to 'lib/libssl/t1_enc.c')
-rw-r--r--lib/libssl/t1_enc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c
index 5d889fa6654..b9dcbac6614 100644
--- a/lib/libssl/t1_enc.c
+++ b/lib/libssl/t1_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_enc.c,v 1.134 2021/03/24 18:40:03 jsing Exp $ */
+/* $OpenBSD: t1_enc.c,v 1.135 2021/03/24 18:44:00 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -343,7 +343,7 @@ tls1_change_cipher_state(SSL *s, int which)
if (aead != NULL) {
key_len = EVP_AEAD_key_length(aead);
- iv_len = SSL_CIPHER_AEAD_FIXED_NONCE_LEN(S3I(s)->hs.new_cipher);
+ iv_len = SSL_CIPHER_AEAD_FIXED_NONCE_LEN(S3I(s)->hs.cipher);
} else {
key_len = EVP_CIPHER_key_length(cipher);
iv_len = EVP_CIPHER_iv_length(cipher);