diff options
| author |   jsing <jsing@openbsd.org> | 2021-03-24 18:43:59 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2021-03-24 18:43:59 +0000 |
| commit | 661440b7167304f3cb76c0becafae8455175d275 (patch) | |
| tree | 521853b33a4c8965fbe98a9c54b8872137ca7e8d /lib/libssl/ssl_lib.c | |
| parent | Add SSL_HANDSHAKE_TLS12 for TLSv1.2 specific handshake data. (diff) | |
| download | wireguard-openbsd-661440b7167304f3cb76c0becafae8455175d275.tar.xz wireguard-openbsd-661440b7167304f3cb76c0becafae8455175d275.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 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index 4b215a786de..e3e0c974af3 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.251 2021/03/02 15:43:12 tb Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.252 2021/03/24 18:44:00 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -2111,8 +2111,8 @@ ssl_using_ecc_cipher(SSL *s) { unsigned long alg_a, alg_k; - alg_a = S3I(s)->hs.new_cipher->algorithm_auth; - alg_k = S3I(s)->hs.new_cipher->algorithm_mkey; + alg_a = S3I(s)->hs.cipher->algorithm_auth; + alg_k = S3I(s)->hs.cipher->algorithm_mkey; return SSI(s)->tlsext_ecpointformatlist != NULL && SSI(s)->tlsext_ecpointformatlist_length > 0 && @@ -2122,7 +2122,7 @@ ssl_using_ecc_cipher(SSL *s) int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s) { - const SSL_CIPHER *cs = S3I(s)->hs.new_cipher; + const SSL_CIPHER *cs = S3I(s)->hs.cipher; unsigned long alg_a; alg_a = cs->algorithm_auth; @@ -2150,9 +2150,9 @@ ssl_get_server_send_pkey(const SSL *s) int i; c = s->cert; - ssl_set_cert_masks(c, S3I(s)->hs.new_cipher); + ssl_set_cert_masks(c, S3I(s)->hs.cipher); - alg_a = S3I(s)->hs.new_cipher->algorithm_auth; + alg_a = S3I(s)->hs.cipher->algorithm_auth; if (alg_a & SSL_aECDSA) { i = SSL_PKEY_ECC; @@ -2211,9 +2211,9 @@ ssl_get_auto_dh(SSL *s) if (s->cert->dh_tmp_auto == 2) { keylen = 1024; - } else if (S3I(s)->hs.new_cipher->algorithm_auth & SSL_aNULL) { + } else if (S3I(s)->hs.cipher->algorithm_auth & SSL_aNULL) { keylen = 1024; - if (S3I(s)->hs.new_cipher->strength_bits == 256) + if (S3I(s)->hs.cipher->strength_bits == 256) keylen = 3072; } else { if ((cpk = ssl_get_server_send_pkey(s)) == NULL) |