diff options
| author |   jsing <jsing@openbsd.org> | 2014-11-27 16:03:03 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-11-27 16:03:03 +0000 |
| commit | 1d1d8690bd0bd971ae25d1f588b533ef33c97662 (patch) | |
| tree | c73db3b912cf1eb974c4175ad4bf097d98577c6a /lib/libssl/src | |
| parent | Another spot where the VLAN tag doesn't need swapping in the currently (diff) | |
| download | wireguard-openbsd-1d1d8690bd0bd971ae25d1f588b533ef33c97662.tar.xz wireguard-openbsd-1d1d8690bd0bd971ae25d1f588b533ef33c97662.zip | |
Avoid a NULL dereference in the DTLS client that can be triggered by a
crafted server response used in conjunction with an anonymous DH or
anonymous ECDH ciphersuite.
Fixes CVE-2014-3510, which is effectively a repeat of CVE-2014-3470 in
copied code.
Reported by Felix Groebert of the Google Security Team.
ok beck@ miod@
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/ssl/d1_clnt.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/libssl/src/ssl/d1_clnt.c b/lib/libssl/src/ssl/d1_clnt.c index 7f6e232128a..de5721851ef 100644 --- a/lib/libssl/src/ssl/d1_clnt.c +++ b/lib/libssl/src/ssl/d1_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_clnt.c,v 1.37 2014/11/16 14:12:47 jsing Exp $ */ +/* $OpenBSD: d1_clnt.c,v 1.38 2014/11/27 16:03:03 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -934,6 +934,14 @@ dtls1_send_client_key_exchange(SSL *s) alg_k = s->s3->tmp.new_cipher->algorithm_mkey; + if (s->session->sess_cert == NULL) { + ssl3_send_alert(s, SSL3_AL_FATAL, + SSL_AD_HANDSHAKE_FAILURE); + SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE, + ERR_R_INTERNAL_ERROR); + goto err; + } + if (alg_k & SSL_kRSA) { RSA *rsa; unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH]; |