summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_enc.c
diff options
context:
space:
mode:
authorjsing <>2021-03-24 18:44:00 +0000
committerjsing <>2021-03-24 18:44:00 +0000
commitae1702cd90dfc51fd5483baea6488cd99ac9c26b (patch)
tree4ba7ed86321d6c92257c882bce631aa4a7f603b8 /src/lib/libssl/t1_enc.c
parent3ce9712d99b47c9a9db840f6cf8cc970a5f841dd (diff)
downloadopenbsd-ae1702cd90dfc51fd5483baea6488cd99ac9c26b.tar.gz
openbsd-ae1702cd90dfc51fd5483baea6488cd99ac9c26b.tar.bz2
openbsd-ae1702cd90dfc51fd5483baea6488cd99ac9c26b.zip
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 'src/lib/libssl/t1_enc.c')
-rw-r--r--src/lib/libssl/t1_enc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index 5d889fa665..b9dcbac661 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_enc.c,v 1.134 2021/03/24 18:40:03 jsing Exp $ */ 1/* $OpenBSD: t1_enc.c,v 1.135 2021/03/24 18:44:00 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -343,7 +343,7 @@ tls1_change_cipher_state(SSL *s, int which)
343 343
344 if (aead != NULL) { 344 if (aead != NULL) {
345 key_len = EVP_AEAD_key_length(aead); 345 key_len = EVP_AEAD_key_length(aead);
346 iv_len = SSL_CIPHER_AEAD_FIXED_NONCE_LEN(S3I(s)->hs.new_cipher); 346 iv_len = SSL_CIPHER_AEAD_FIXED_NONCE_LEN(S3I(s)->hs.cipher);
347 } else { 347 } else {
348 key_len = EVP_CIPHER_key_length(cipher); 348 key_len = EVP_CIPHER_key_length(cipher);
349 iv_len = EVP_CIPHER_iv_length(cipher); 349 iv_len = EVP_CIPHER_iv_length(cipher);