summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_both.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/ssl_both.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/ssl_both.c')
-rw-r--r--src/lib/libssl/ssl_both.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_both.c b/src/lib/libssl/ssl_both.c
index 6ce127fb0b..6625286daf 100644
--- a/src/lib/libssl/ssl_both.c
+++ b/src/lib/libssl/ssl_both.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_both.c,v 1.24 2021/02/20 14:14:16 tb Exp $ */ 1/* $OpenBSD: ssl_both.c,v 1.25 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 *
@@ -224,7 +224,7 @@ ssl3_take_mac(SSL *s)
224 * If no new cipher setup return immediately: other functions will 224 * If no new cipher setup return immediately: other functions will
225 * set the appropriate error. 225 * set the appropriate error.
226 */ 226 */
227 if (S3I(s)->hs.new_cipher == NULL) 227 if (S3I(s)->hs.cipher == NULL)
228 return; 228 return;
229 229
230 if (S3I(s)->hs.state & SSL_ST_CONNECT) { 230 if (S3I(s)->hs.state & SSL_ST_CONNECT) {