summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r--src/lib/libssl/ssl_lib.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index c97441c9c0..0277202de3 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.318 2023/12/29 12:24:33 tb Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.319 2024/02/03 15:58:34 beck 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 *
@@ -2297,12 +2297,6 @@ ssl_set_cert_masks(SSL_CERT *c, const SSL_CIPHER *cipher)
2297 mask_a |= SSL_aECDSA; 2297 mask_a |= SSL_aECDSA;
2298 } 2298 }
2299 2299
2300 cpk = &(c->pkeys[SSL_PKEY_GOST01]);
2301 if (cpk->x509 != NULL && cpk->privatekey != NULL) {
2302 mask_k |= SSL_kGOST;
2303 mask_a |= SSL_aGOST01;
2304 }
2305
2306 cpk = &(c->pkeys[SSL_PKEY_RSA]); 2300 cpk = &(c->pkeys[SSL_PKEY_RSA]);
2307 if (cpk->x509 != NULL && cpk->privatekey != NULL) { 2301 if (cpk->x509 != NULL && cpk->privatekey != NULL) {
2308 mask_a |= SSL_aRSA; 2302 mask_a |= SSL_aRSA;
@@ -2363,8 +2357,6 @@ ssl_get_server_send_pkey(const SSL *s)
2363 i = SSL_PKEY_ECC; 2357 i = SSL_PKEY_ECC;
2364 } else if (alg_a & SSL_aRSA) { 2358 } else if (alg_a & SSL_aRSA) {
2365 i = SSL_PKEY_RSA; 2359 i = SSL_PKEY_RSA;
2366 } else if (alg_a & SSL_aGOST01) {
2367 i = SSL_PKEY_GOST01;
2368 } else { /* if (alg_a & SSL_aNULL) */ 2360 } else { /* if (alg_a & SSL_aNULL) */
2369 SSLerror(s, ERR_R_INTERNAL_ERROR); 2361 SSLerror(s, ERR_R_INTERNAL_ERROR);
2370 return (NULL); 2362 return (NULL);