diff options
Diffstat (limited to 'src/lib/libssl/ssl_clnt.c')
-rw-r--r-- | src/lib/libssl/ssl_clnt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c index 6aea590132..441da643fd 100644 --- a/src/lib/libssl/ssl_clnt.c +++ b/src/lib/libssl/ssl_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_clnt.c,v 1.160 2023/06/11 19:01:01 tb Exp $ */ | 1 | /* $OpenBSD: ssl_clnt.c,v 1.161 2023/07/08 16:40:13 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 | * |
@@ -2123,12 +2123,14 @@ ssl3_send_client_verify_sigalgs(SSL *s, EVP_PKEY *pkey, | |||
2123 | SSLerror(s, ERR_R_EVP_LIB); | 2123 | SSLerror(s, ERR_R_EVP_LIB); |
2124 | goto err; | 2124 | goto err; |
2125 | } | 2125 | } |
2126 | #ifndef OPENSSL_NO_GOST | ||
2126 | if (sigalg->key_type == EVP_PKEY_GOSTR01 && | 2127 | if (sigalg->key_type == EVP_PKEY_GOSTR01 && |
2127 | EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN, | 2128 | EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN, |
2128 | EVP_PKEY_CTRL_GOST_SIG_FORMAT, GOST_SIG_FORMAT_RS_LE, NULL) <= 0) { | 2129 | EVP_PKEY_CTRL_GOST_SIG_FORMAT, GOST_SIG_FORMAT_RS_LE, NULL) <= 0) { |
2129 | SSLerror(s, ERR_R_EVP_LIB); | 2130 | SSLerror(s, ERR_R_EVP_LIB); |
2130 | goto err; | 2131 | goto err; |
2131 | } | 2132 | } |
2133 | #endif | ||
2132 | if ((sigalg->flags & SIGALG_FLAG_RSA_PSS) && | 2134 | if ((sigalg->flags & SIGALG_FLAG_RSA_PSS) && |
2133 | (!EVP_PKEY_CTX_set_rsa_padding(pctx, RSA_PKCS1_PSS_PADDING) || | 2135 | (!EVP_PKEY_CTX_set_rsa_padding(pctx, RSA_PKCS1_PSS_PADDING) || |
2134 | !EVP_PKEY_CTX_set_rsa_pss_saltlen(pctx, -1))) { | 2136 | !EVP_PKEY_CTX_set_rsa_pss_saltlen(pctx, -1))) { |
@@ -2267,11 +2269,13 @@ ssl3_send_client_verify_gost(SSL *s, EVP_PKEY *pkey, CBB *cert_verify) | |||
2267 | SSLerror(s, ERR_R_EVP_LIB); | 2269 | SSLerror(s, ERR_R_EVP_LIB); |
2268 | goto err; | 2270 | goto err; |
2269 | } | 2271 | } |
2272 | #ifndef OPENSSL_NO_GOST | ||
2270 | if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN, | 2273 | if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN, |
2271 | EVP_PKEY_CTRL_GOST_SIG_FORMAT, GOST_SIG_FORMAT_RS_LE, NULL) <= 0) { | 2274 | EVP_PKEY_CTRL_GOST_SIG_FORMAT, GOST_SIG_FORMAT_RS_LE, NULL) <= 0) { |
2272 | SSLerror(s, ERR_R_EVP_LIB); | 2275 | SSLerror(s, ERR_R_EVP_LIB); |
2273 | goto err; | 2276 | goto err; |
2274 | } | 2277 | } |
2278 | #endif | ||
2275 | if (!EVP_DigestSign(mctx, NULL, &signature_len, hdata, hdata_len)) { | 2279 | if (!EVP_DigestSign(mctx, NULL, &signature_len, hdata, hdata_len)) { |
2276 | SSLerror(s, ERR_R_EVP_LIB); | 2280 | SSLerror(s, ERR_R_EVP_LIB); |
2277 | goto err; | 2281 | goto err; |