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

Revert "Fixed incorrect return code handling in ssl3_final_finish_mac"

Browse Source 
This reverts commit 2f1dffa88e.

Missing attribution.
This commit is contained in:
Matt Caswell 2014-06-13 15:35:20 +01:00
parent a09e4d24ad
commit 043fd64689
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ssl/s3_enc.c
View File

@ -663,18 +663,10 @@ int ssl3_cert_verify_mac(SSL *s, int md_nid, unsigned char *p)
int ssl3_final_finish_mac(SSL *s,
const char *sender, int len, unsigned char *p)
{
int ret, sha1len;
int ret;
ret=ssl3_handshake_mac(s,NID_md5,sender,len,p);
if(ret == 0)
return 0;
p+=ret;
sha1len=ssl3_handshake_mac(s,NID_sha1,sender,len,p);
if(sha1len == 0)
return 0;
ret+=sha1len;
ret+=ssl3_handshake_mac(s,NID_sha1,sender,len,p);
return(ret);
}
static int ssl3_handshake_mac(SSL *s, int md_nid,