diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-10-23 20:36:17 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-08 13:43:20 +0000 |
| commit | 98a0f9660d374f58f79ee0efcc8c1672a805e8e8 (patch) | |
| tree | 038ee943bdb594f113b2892283f963595227dc89 | |
| parent | 45fe66b8ba026186aa5d8ef1e0e6010ea74d5c0b (diff) | |
Unauthenticated DH client certificate fix.
Fix to prevent use of DH client certificates without sending
certificate verify message.
If we've used a client certificate to generate the premaster secret
ssl3_get_client_key_exchange returns 2 and ssl3_get_cert_verify is
never called.
We can only skip the certificate verify message in
ssl3_get_cert_verify if the client didn't send a certificate.
Thanks to Karthikeyan Bhargavan for reporting this issue.
CVE-2015-0205
Reviewed-by: Matt Caswell <matt@openssl.org>
| -rw-r--r-- | ssl/s3_srvr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index d883f86ca5..fadca74ec2 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -3014,7 +3014,7 @@ int ssl3_get_cert_verify(SSL *s) if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_VERIFY) { s->s3->tmp.reuse_message=1; - if ((peer != NULL) && (type & EVP_PKT_SIGN)) + if (peer != NULL) { al=SSL_AD_UNEXPECTED_MESSAGE; SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_MISSING_VERIFY_MESSAGE); |