diff options
author | brad <> | 2004-03-17 17:50:59 +0000 |
---|---|---|
committer | brad <> | 2004-03-17 17:50:59 +0000 |
commit | c3dcb54917dc3b3340ab127febd8090878383816 (patch) | |
tree | ae3eead1bf0116ff1679c75ad265c31c3cb3c145 | |
parent | ec3df9335c2be86d2de19f2111bf4a15736c11bc (diff) | |
download | openbsd-OPENBSD_3_4.tar.gz openbsd-OPENBSD_3_4.tar.bz2 openbsd-OPENBSD_3_4.zip |
MFC:OPENBSD_3_4
Fix by markus@
avoid null-pointer deref (aka CAN-2004-0079)
see http://www.openssl.org/news/secadv_20040317.txt
ok deraadt@ markus@
-rw-r--r-- | src/lib/libssl/src/ssl/s3_pkt.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/libssl/src/ssl/s3_pkt.c b/src/lib/libssl/src/ssl/s3_pkt.c index 3f88429e79..9f3e5139ad 100644 --- a/src/lib/libssl/src/ssl/s3_pkt.c +++ b/src/lib/libssl/src/ssl/s3_pkt.c | |||
@@ -1085,6 +1085,14 @@ start: | |||
1085 | goto err; | 1085 | goto err; |
1086 | } | 1086 | } |
1087 | 1087 | ||
1088 | /* Check we have a cipher to change to */ | ||
1089 | if (s->s3->tmp.new_cipher == NULL) | ||
1090 | { | ||
1091 | i=SSL_AD_UNEXPECTED_MESSAGE; | ||
1092 | SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_CCS_RECEIVED_EARLY); | ||
1093 | goto err; | ||
1094 | } | ||
1095 | |||
1088 | rr->length=0; | 1096 | rr->length=0; |
1089 | 1097 | ||
1090 | if (s->msg_callback) | 1098 | if (s->msg_callback) |