summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_lib.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/s3_lib.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/s3_lib.c')
-rw-r--r--src/lib/libssl/s3_lib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 5e39907d9c..9df06c51be 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_lib.c,v 1.205 2021/03/21 18:36:34 jsing Exp $ */ 1/* $OpenBSD: s3_lib.c,v 1.206 2021/03/24 18:43:59 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 *
@@ -2548,7 +2548,7 @@ ssl3_get_req_cert_types(SSL *s, CBB *cbb)
2548{ 2548{
2549 unsigned long alg_k; 2549 unsigned long alg_k;
2550 2550
2551 alg_k = S3I(s)->hs.new_cipher->algorithm_mkey; 2551 alg_k = S3I(s)->hs.cipher->algorithm_mkey;
2552 2552
2553#ifndef OPENSSL_NO_GOST 2553#ifndef OPENSSL_NO_GOST
2554 if ((alg_k & SSL_kGOST) != 0) { 2554 if ((alg_k & SSL_kGOST) != 0) {