generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
(Coverity ID 140).
This commit is contained in:
Ben Laurie 2008-12-27 02:09:24 +00:00
parent 6ba71a7173
commit 9b9cb004f7
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssl/d1_pkt.c
View File

@ -428,6 +428,12 @@ printf("\n");
if (!clear) if (!clear)
{ {
mac_size=EVP_MD_CTX_size(s->read_hash); 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) if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH+mac_size)
{ {

1
ssl/ssl.h
View File

@ -1996,6 +1996,7 @@ void ERR_load_SSL_strings(void);
#define SSL_R_BAD_HELLO_REQUEST 105 #define SSL_R_BAD_HELLO_REQUEST 105
#define SSL_R_BAD_LENGTH 271 #define SSL_R_BAD_LENGTH 271
#define SSL_R_BAD_MAC_DECODE 113 #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_MESSAGE_TYPE 114
#define SSL_R_BAD_PACKET_LENGTH 115 #define SSL_R_BAD_PACKET_LENGTH 115
#define SSL_R_BAD_PROTOCOL_VERSION_NUMBER 116 #define SSL_R_BAD_PROTOCOL_VERSION_NUMBER 116

1
ssl/ssl_err.c
View File

@ -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_HELLO_REQUEST) ,"bad hello request"},
{ERR_REASON(SSL_R_BAD_LENGTH) ,"bad length"}, {ERR_REASON(SSL_R_BAD_LENGTH) ,"bad length"},
{ERR_REASON(SSL_R_BAD_MAC_DECODE) ,"bad mac decode"}, {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_MESSAGE_TYPE) ,"bad message type"},
{ERR_REASON(SSL_R_BAD_PACKET_LENGTH) ,"bad packet length"}, {ERR_REASON(SSL_R_BAD_PACKET_LENGTH) ,"bad packet length"},
{ERR_REASON(SSL_R_BAD_PROTOCOL_VERSION_NUMBER),"bad protocol version number"}, {ERR_REASON(SSL_R_BAD_PROTOCOL_VERSION_NUMBER),"bad protocol version number"},