diff options
author | jsing <> | 2020-06-05 17:53:26 +0000 |
---|---|---|
committer | jsing <> | 2020-06-05 17:53:26 +0000 |
commit | 96df98750343f1e7461c01e22ea0b7abd7f934f9 (patch) | |
tree | 267abe3b33b9f515985883e0cd2107ab6a46c232 /src/lib/libssl/ssl_srvr.c | |
parent | e321209822b62044f1340bc2b6ec45addbaad36b (diff) | |
download | openbsd-96df98750343f1e7461c01e22ea0b7abd7f934f9.tar.gz openbsd-96df98750343f1e7461c01e22ea0b7abd7f934f9.tar.bz2 openbsd-96df98750343f1e7461c01e22ea0b7abd7f934f9.zip |
Enable GOST_SIG_FORMAT_RS_LE when verifying certificate signatures.
GOST cipher suites requires that CertVerify signatures be generated in a
special way (see ssl3_send_client_kex_gost(), ssl3_get_cert_verify()).
However, the GOST_SIG_FORMAT_RS_LE flag was not passed in case of TLS 1.2
connections (because they use different code path). Set this flag on
GOST PKEYs.
Diff from Dmitry Baryshkov <dbaryshkov@gmail.com>
Sponsored by ROSA Linux
ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_srvr.c')
-rw-r--r-- | src/lib/libssl/ssl_srvr.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c index 15dfdc35b1..706ad1453b 100644 --- a/src/lib/libssl/ssl_srvr.c +++ b/src/lib/libssl/ssl_srvr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_srvr.c,v 1.78 2020/06/01 08:04:02 tb Exp $ */ | 1 | /* $OpenBSD: ssl_srvr.c,v 1.79 2020/06/05 17:53:26 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 | * |
@@ -2199,6 +2199,13 @@ ssl3_get_cert_verify(SSL *s) | |||
2199 | al = SSL_AD_INTERNAL_ERROR; | 2199 | al = SSL_AD_INTERNAL_ERROR; |
2200 | goto f_err; | 2200 | goto f_err; |
2201 | } | 2201 | } |
2202 | if (sigalg->key_type == EVP_PKEY_GOSTR01 && | ||
2203 | EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_VERIFY, | ||
2204 | EVP_PKEY_CTRL_GOST_SIG_FORMAT, GOST_SIG_FORMAT_RS_LE, | ||
2205 | NULL) <= 0) { | ||
2206 | al = SSL_AD_INTERNAL_ERROR; | ||
2207 | goto f_err; | ||
2208 | } | ||
2202 | if (!EVP_DigestVerifyUpdate(&mctx, hdata, hdatalen)) { | 2209 | if (!EVP_DigestVerifyUpdate(&mctx, hdata, hdatalen)) { |
2203 | SSLerror(s, ERR_R_EVP_LIB); | 2210 | SSLerror(s, ERR_R_EVP_LIB); |
2204 | al = SSL_AD_INTERNAL_ERROR; | 2211 | al = SSL_AD_INTERNAL_ERROR; |