X-Git-Url: http://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fs3_both.c;h=53b9390fdd3af30d0576825d0b0e19bc5d290ac6;hp=1e5dcab7d30520c00cc60d55d6ebd6e2ae3e6e6c;hb=197e0ea817ad64820789d86711d55ff50d71f631;hpb=c776a3f398b1fd0d59e9247c0c4c6b79f5692b33

diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index 1e5dcab..53b9390 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -210,7 +210,11 @@ static void ssl3_take_mac(SSL *s)
 	{
 	const char *sender;
 	int slen;
-
+	/* If no new cipher setup return immediately: other functions will
+	 * set the appropriate error.
+	 */
+	if (s->s3->tmp.new_cipher == NULL)
+		return;
 	if (s->state & SSL_ST_CONNECT)
 		{
 		sender=s->method->ssl3_enc->server_finished_label;