summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2021-06-30 09:59:07 +0000
committerjsing <>2021-06-30 09:59:07 +0000
commit518e15603ba5e5b01dd2c19f42d555ef66903191 (patch)
tree2b2de37bd81b8c38ecdb7b5679cbd035be2b2b64
parent7c7e8559fa82726509586a00b183c2b60fee576e (diff)
downloadopenbsd-518e15603ba5e5b01dd2c19f42d555ef66903191.tar.gz
openbsd-518e15603ba5e5b01dd2c19f42d555ef66903191.tar.bz2
openbsd-518e15603ba5e5b01dd2c19f42d555ef66903191.zip
Correct sigalg hash usage when signing content for client verify.
This was inadvertently broken during sigalgs refactoring.
-rw-r--r--src/lib/libssl/ssl_clnt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index 4085fed39b..8864909c9e 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.106 2021/06/29 19:56:11 jsing Exp $ */ 1/* $OpenBSD: ssl_clnt.c,v 1.107 2021/06/30 09:59:07 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 *
@@ -2323,7 +2323,6 @@ ssl3_send_client_verify_sigalgs(SSL *s, EVP_PKEY *pkey,
2323 CBB cbb_signature; 2323 CBB cbb_signature;
2324 EVP_PKEY_CTX *pctx = NULL; 2324 EVP_PKEY_CTX *pctx = NULL;
2325 EVP_MD_CTX mctx; 2325 EVP_MD_CTX mctx;
2326 const EVP_MD *md;
2327 const unsigned char *hdata; 2326 const unsigned char *hdata;
2328 unsigned char *signature = NULL; 2327 unsigned char *signature = NULL;
2329 size_t signature_len, hdata_len; 2328 size_t signature_len, hdata_len;
@@ -2335,7 +2334,7 @@ ssl3_send_client_verify_sigalgs(SSL *s, EVP_PKEY *pkey,
2335 SSLerror(s, ERR_R_INTERNAL_ERROR); 2334 SSLerror(s, ERR_R_INTERNAL_ERROR);
2336 goto err; 2335 goto err;
2337 } 2336 }
2338 if (!EVP_DigestSignInit(&mctx, &pctx, md, NULL, pkey)) { 2337 if (!EVP_DigestSignInit(&mctx, &pctx, sigalg->md(), NULL, pkey)) {
2339 SSLerror(s, ERR_R_EVP_LIB); 2338 SSLerror(s, ERR_R_EVP_LIB);
2340 goto err; 2339 goto err;
2341 } 2340 }