diff options
author | Matt Caswell <matt@openssl.org> | 2014-06-13 15:50:28 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2014-06-13 15:50:28 +0100 |
commit | 7f133c357b39ebb1ccf7eecb9b43530d9db1eb57 (patch) | |
tree | 566abe0112ae13e66a980cd07915a4f0e03e92e6 /ssl | |
parent | 3cc8a3f2343cda796de90c127b9e907ca3ec2da5 (diff) |
Revert "Fixed incorrect return code handling in ssl3_final_finish_mac"
This reverts commit 728bd41a159ea16a60111e7c1120ec2a005507b3.
Missing attribution.
Diffstat (limited to 'ssl')
-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 86f06d02c7..196f0739d5 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -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, |