diff options
author | Matt Caswell <matt@openssl.org> | 2014-06-10 23:24:28 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2014-06-10 23:31:50 +0100 |
commit | 2f1dffa88e1b120add4f0b3a794fbca65aa7768d (patch) | |
tree | 868cb354db08617988a96ebe6e04c6cf5d78c284 /ssl | |
parent | e2eabed110b6d88fd15ac3063cab23dcd5090b44 (diff) | |
download | openssl-2f1dffa88e1b120add4f0b3a794fbca65aa7768d.tar.gz |
Fixed incorrect return code handling in ssl3_final_finish_mac
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 f1b2641853..6c103a042f 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, |