projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c97e457
)
Additional CVE-2014-0224 protection.
author
Dr. Stephen Henson
<steve@openssl.org>
Fri, 16 May 2014 11:55:16 +0000
(12:55 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Tue, 3 Jun 2014 15:30:37 +0000
(16:30 +0100)
Return a fatal error if an attempt is made to use a zero length
master secret.
ssl/s3_pkt.c
patch
|
blob
|
history
diff --git
a/ssl/s3_pkt.c
b/ssl/s3_pkt.c
index 8950e902a64e2b450b2b6c3443fbc4487318a4d3..807cfc5523cf47c498275e568e68dcb508d7fb5d 100644
(file)
--- a/
ssl/s3_pkt.c
+++ b/
ssl/s3_pkt.c
@@
-1398,7
+1398,7
@@
int ssl3_do_change_cipher_spec(SSL *s)
if (s->s3->tmp.key_block == NULL)
{
- if (s->session == NULL
)
+ if (s->session == NULL
|| s->session->master_key_length == 0)
{
/* might happen if dtls1_read_bytes() calls this */
SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC,SSL_R_CCS_RECEIVED_EARLY);