Commit 9b9cb004 authored by Ben Laurie's avatar Ben Laurie
Browse files

Deal with the unlikely event that EVP_MD_CTX_size() returns an error. 

(Coverity ID 140).
parent 6ba71a71

ssl/d1_pkt.c

+6 −0
Original line number Diff line number Diff line
@@ -428,6 +428,12 @@ printf("\n"); 
	if (!clear)

		{

		mac_size=EVP_MD_CTX_size(s->read_hash);

		if (mac_size <= 0)

			{

			al=SSL_AD_INTERNAL_ERROR;

			SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_BAD_MAC_LENGTH);

			goto f_err;

			}



		if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH+mac_size)

			{

ssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -1996,6 +1996,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_BAD_HELLO_REQUEST				 105

#define SSL_R_BAD_LENGTH				 271

#define SSL_R_BAD_MAC_DECODE				 113

#define SSL_R_BAD_MAC_LENGTH				 333

#define SSL_R_BAD_MESSAGE_TYPE				 114

#define SSL_R_BAD_PACKET_LENGTH				 115

#define SSL_R_BAD_PROTOCOL_VERSION_NUMBER		 116

ssl/ssl_err.c

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= 
{ERR_REASON(SSL_R_BAD_HELLO_REQUEST)     ,"bad hello request"},

{ERR_REASON(SSL_R_BAD_LENGTH)            ,"bad length"},

{ERR_REASON(SSL_R_BAD_MAC_DECODE)        ,"bad mac decode"},

{ERR_REASON(SSL_R_BAD_MAC_LENGTH)        ,"bad mac length"},

{ERR_REASON(SSL_R_BAD_MESSAGE_TYPE)      ,"bad message type"},

{ERR_REASON(SSL_R_BAD_PACKET_LENGTH)     ,"bad packet length"},

{ERR_REASON(SSL_R_BAD_PROTOCOL_VERSION_NUMBER),"bad protocol version number"},