diff options
| author | Mark J. Cox <[email protected]> | 2004-03-17 12:40:44 +0100 |
|---|---|---|
| committer | Mark J. Cox <[email protected]> | 2004-03-17 12:40:44 +0100 |
| commit | 8ccf402239a07d23ab308c9dc11bfbe59bad3e65 (patch) | |
| tree | 67048ca130d8c3a3b017bf71be4a9363f7e7a03a /ssl | |
| parent | Win32 fixes. (diff) | |
| download | openssl-OpenSSL_0_9_6m.tar.gz openssl-OpenSSL_0_9_6m.zip | |
Fix null-pointer assignment in do_change_cipher_spec() revealedOpenSSL_0_9_6m
by using the Codenomicon TLS Test Tool (CAN-2004-0079)
Prepare for 0.9.6m tagging and release
Submitted by: Steven Henson
Reviewed by: Joe Orton
Approved by: Mark Cox
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_pkt.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index caf975d6888..75b49f715f1 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -1079,6 +1079,14 @@ start: goto err; } + /* Check we have a cipher to change to */ + if (s->s3->tmp.new_cipher == NULL) + { + i=SSL_AD_UNEXPECTED_MESSAGE; + SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_CCS_RECEIVED_EARLY); + goto err; + } + rr->length=0; s->s3->change_cipher_spec=1; if (!do_change_cipher_spec(s)) |