From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 26 Dec 2011 19:38:09 +0000 (+0000)
Subject: PR: 2326
X-Git-Tag: OpenSSL_1_0_1-beta1~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f89af47438bbbd0e645e92e83bb98c61de46a34d;p=oweals%2Fopenssl.git

PR: 2326
Submitted by: Tianjie Mao <tjmao@tjmao.net>
Reviewed by: steve

Fix incorrect comma expressions and goto f_err as alert has been set.
---

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index d1110e02c3..8874ce8818 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1005,7 +1005,7 @@ int ssl3_get_server_hello(SSL *s)
 		/* wrong packet length */
 		al=SSL_AD_DECODE_ERROR;
 		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_PACKET_LENGTH);
-		goto err;
+		goto f_err;
 		}
 
 	return(1);
@@ -2005,7 +2005,7 @@ int ssl3_get_new_session_ticket(SSL *s)
 	if (n < 6)
 		{
 		/* need at least ticket_lifetime_hint + ticket length */
-		al = SSL3_AL_FATAL,SSL_AD_DECODE_ERROR;
+		al = SSL_AD_DECODE_ERROR;
 		SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH);
 		goto f_err;
 		}
@@ -2016,7 +2016,7 @@ int ssl3_get_new_session_ticket(SSL *s)
 	/* ticket_lifetime_hint + ticket_length + ticket */
 	if (ticklen + 6 != n)
 		{
-		al = SSL3_AL_FATAL,SSL_AD_DECODE_ERROR;
+		al = SSL_AD_DECODE_ERROR;
 		SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH);
 		goto f_err;
 		}