diff options
author | Matt Caswell <matt@openssl.org> | 2014-06-13 15:53:08 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2014-06-13 15:53:08 +0100 |
commit | 01736e6c415c1b08ea907380bedcd63ad4a66330 (patch) | |
tree | d7d70be341ac14109504ee39091a53fd0324a0e2 /ssl/s3_enc.c | |
parent | 29411a0c7a00a73e4ca42be8b5a7401d3bb5107a (diff) |
Revert "Fixed incorrect return code handling in ssl3_final_finish_mac"
This reverts commit 9ab788aa23feaa0e3b9efc2213e0c27913f8d987.
Missing attribution
Diffstat (limited to 'ssl/s3_enc.c')
-rw-r--r-- | ssl/s3_enc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 996267725e..e3cd4f062c 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -642,18 +642,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, |