diff options
| author |   jca <jca@openbsd.org> | 2014-02-27 21:04:57 +0000 |
|---|---|---|
| committer | jca <jca@openbsd.org> | 2014-02-27 21:04:57 +0000 |
| commit | 724b1063fe45f812c6c49b2bd4e01ffac44b5cf7 (patch) | |
| tree | c0d4574f0e1068cefda493f918eede5b1729afa5 /lib/libssl/src/ssl/s3_pkt.c | |
| parent | some unlikely tape candidates (diff) | |
| download | wireguard-openbsd-724b1063fe45f812c6c49b2bd4e01ffac44b5cf7.tar.xz wireguard-openbsd-724b1063fe45f812c6c49b2bd4e01ffac44b5cf7.zip | |
SECURITY fixes backported from openssl-1.0.1f. ok mikeb@
CVE-2013-4353 NULL pointer dereference with crafted Next Protocol
Negotiation record in TLS handshake.
Upstream: 197e0ea
CVE-2013-6449 Fix crash with crafted traffic from a TLS 1.2 client.
Upstream: ca98926, 0294b2b
CVE-2013-6450 Fix DTLS retransmission from previous session.
Upstream: 3462896
Diffstat (limited to 'lib/libssl/src/ssl/s3_pkt.c')
| -rw-r--r-- | lib/libssl/src/ssl/s3_pkt.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/libssl/src/ssl/s3_pkt.c b/lib/libssl/src/ssl/s3_pkt.c index a7d2defbea5..c499c29cb5e 100644 --- a/lib/libssl/src/ssl/s3_pkt.c +++ b/lib/libssl/src/ssl/s3_pkt.c @@ -1458,8 +1458,14 @@ int ssl3_do_change_cipher_spec(SSL *s) slen=s->method->ssl3_enc->client_finished_label_len; } - s->s3->tmp.peer_finish_md_len = s->method->ssl3_enc->final_finish_mac(s, + i = s->method->ssl3_enc->final_finish_mac(s, sender,slen,s->s3->tmp.peer_finish_md); + if (i == 0) + { + SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC, ERR_R_INTERNAL_ERROR); + return 0; + } + s->s3->tmp.peer_finish_md_len = i; return(1); } |