summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-10-23 20:36:17 +0100
committerMatt Caswell <matt@openssl.org>2015-01-08 15:46:42 +0000
commitbe3fb8d15dd5a233eab0c454677d538e64d17f82 (patch)
treeda1cb8410e79c0710d6787f52688e7f0b8b53a43
parentfb73f12a9cfc377e3046228cc69351a40716c396 (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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 9a10a7cbfa..230a36f80c 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -3016,7 +3016,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);