From e8232d78abaf5a170e34e0742d0042a65bcaafe4 Mon Sep 17 00:00:00 2001
From: nectar <nectar@FreeBSD.org>
Date: Wed, 17 Mar 2004 12:11:08 +0000
Subject: Correct a denial-of-service vulnerability in OpenSSL (CAN-2004-0079).

Obtained from:	OpenSSL CVS (http://cvs.openssl.org/chngview?cn=12033)
---
 crypto/openssl/ssl/s3_pkt.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'crypto')

diff --git a/crypto/openssl/ssl/s3_pkt.c b/crypto/openssl/ssl/s3_pkt.c
index 3f88429..9f3e513 100644
--- a/crypto/openssl/ssl/s3_pkt.c
+++ b/crypto/openssl/ssl/s3_pkt.c
@@ -1085,6 +1085,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;
 
 		if (s->msg_callback)
-- 
cgit v1.1