diff options
author | Matt Caswell <matt@openssl.org> | 2014-06-10 23:24:28 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2014-06-13 15:50:58 +0100 |
commit | 561ba124632d158469cd44775ab0a89a807ed727 (patch) | |
tree | 114b82282f22b30409e2692f23c9216ace6c6f09 /ssl | |
parent | 7f133c357b39ebb1ccf7eecb9b43530d9db1eb57 (diff) |
Fixed incorrect return code handling in ssl3_final_finish_mac.
Based on an original patch by Joel Sing (OpenBSD) who also originally identified the issue.
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/s3_enc.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 196f0739d5..86f06d02c7 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -663,10 +663,18 @@ 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; + int ret, sha1len; ret=ssl3_handshake_mac(s,NID_md5,sender,len,p); + if(ret == 0) + return 0; + p+=ret; - ret+=ssl3_handshake_mac(s,NID_sha1,sender,len,p); + + sha1len=ssl3_handshake_mac(s,NID_sha1,sender,len,p); + if(sha1len == 0) + return 0; + + ret+=sha1len; return(ret); } static int ssl3_handshake_mac(SSL *s, int md_nid, |