Commit 6c61cfbe authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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.
parent 2ee77d36

ssl/s3_clnt.c

+3 −3
Original line number Diff line number Diff line
@@ -878,7 +878,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);
@@ -1713,7 +1713,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;

		}
@@ -1724,7 +1724,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;

		}