summaryrefslogtreecommitdiffstats
path: root/ssl/s3_pkt.c
diff options
context:
space:
mode:
authorNils Larsch <nils@openssl.org>2005-05-03 10:00:16 +0000
committerNils Larsch <nils@openssl.org>2005-05-03 10:00:16 +0000
commit9e5790ce21f2410f1276e77388770094291f1d47 (patch)
tree79a2045bba24624bab8b0354b45437f1910c97ec /ssl/s3_pkt.c
parentfce8c6cc53650959776db5828aa441ce9bbae1bb (diff)
backport fix from the stable branch
Diffstat (limited to 'ssl/s3_pkt.c')
-rw-r--r--ssl/s3_pkt.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index f92ec59447..a24cec2d20 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1087,6 +1087,14 @@ start:
goto f_err;
}
+ /* Check we have a cipher to change to */
+ if (s->s3->tmp.new_cipher == NULL)
+ {
+ al=SSL_AD_UNEXPECTED_MESSAGE;
+ SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_CCS_RECEIVED_EARLY);
+ goto f_err;
+ }
+
rr->length=0;
if (s->msg_callback)