From 4043d7db4e466d15193c3bad3b204048fc13b785 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 9 Oct 2006 16:47:10 +0000 Subject: Merged in changes from OpenSSL 0.9.8d svn path=/openssl/trunk/CHANGES; revision=377 --- openssl/trunk/ssl/d1_pkt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'openssl/trunk/ssl/d1_pkt.c') diff --git a/openssl/trunk/ssl/d1_pkt.c b/openssl/trunk/ssl/d1_pkt.c index be6ee323..f8f45165 100644 --- a/openssl/trunk/ssl/d1_pkt.c +++ b/openssl/trunk/ssl/d1_pkt.c @@ -796,8 +796,14 @@ start: dest = s->d1->alert_fragment; dest_len = &s->d1->alert_fragment_len; } - else /* else it's a CCS message */ - OPENSSL_assert(rr->type == SSL3_RT_CHANGE_CIPHER_SPEC); + /* else it's a CCS message, or it's wrong */ + else if (rr->type != SSL3_RT_CHANGE_CIPHER_SPEC) + { + /* Not certain if this is the right error handling */ + al=SSL_AD_UNEXPECTED_MESSAGE; + SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_UNEXPECTED_RECORD); + goto f_err; + } if (dest_maxlen > 0) -- cgit v1.2.3