summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_lib.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/ssl_lib.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index a0d3d05775..4fe7fb58dc 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_lib.c,v 1.280 2021/12/04 14:03:22 jsing Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.281 2022/01/07 16:45:06 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 *
@@ -2198,7 +2198,8 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
2198 mask_a = SSL_aNULL | SSL_aTLS1_3; 2198 mask_a = SSL_aNULL | SSL_aTLS1_3;
2199 mask_k = SSL_kECDHE | SSL_kTLS1_3; 2199 mask_k = SSL_kECDHE | SSL_kTLS1_3;
2200 2200
2201 if (c->dh_tmp != NULL || c->dh_tmp_cb != NULL || c->dh_tmp_auto != 0) 2201 if (c->dhe_params != NULL || c->dhe_params_cb != NULL ||
2202 c->dhe_params_auto != 0)
2202 mask_k |= SSL_kDHE; 2203 mask_k |= SSL_kDHE;
2203 2204
2204 cpk = &(c->pkeys[SSL_PKEY_ECC]); 2205 cpk = &(c->pkeys[SSL_PKEY_ECC]);
@@ -2324,7 +2325,7 @@ ssl_dhe_params_auto_key_bits(SSL *s)
2324 CERT_PKEY *cpk; 2325 CERT_PKEY *cpk;
2325 int key_bits; 2326 int key_bits;
2326 2327
2327 if (s->cert->dh_tmp_auto == 2) { 2328 if (s->cert->dhe_params_auto == 2) {
2328 key_bits = 1024; 2329 key_bits = 1024;
2329 } else if (S3I(s)->hs.cipher->algorithm_auth & SSL_aNULL) { 2330 } else if (S3I(s)->hs.cipher->algorithm_auth & SSL_aNULL) {
2330 key_bits = 1024; 2331 key_bits = 1024;