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

Fix incorrect comma expressions and goto f_err as alert has been set.
This commit is contained in:
Dr. Stephen Henson 2011-12-26 19:37:58 +00:00
parent 995a6b10e1
commit f3d781bb43

View File

@ -1005,7 +1005,7 @@ int ssl3_get_server_hello(SSL *s)
/* wrong packet length */ /* wrong packet length */
al=SSL_AD_DECODE_ERROR; al=SSL_AD_DECODE_ERROR;
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_PACKET_LENGTH); SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_PACKET_LENGTH);
goto err; goto f_err;
} }
return(1); return(1);
@ -2005,7 +2005,7 @@ int ssl3_get_new_session_ticket(SSL *s)
if (n < 6) if (n < 6)
{ {
/* need at least ticket_lifetime_hint + ticket length */ /* 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); SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH);
goto f_err; goto f_err;
} }
@ -2016,7 +2016,7 @@ int ssl3_get_new_session_ticket(SSL *s)
/* ticket_lifetime_hint + ticket_length + ticket */ /* ticket_lifetime_hint + ticket_length + ticket */
if (ticklen + 6 != n) 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); SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH);
goto f_err; goto f_err;
} }