From a357acdd3b7cd285e037fa5af16a24a49dc87cf2 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 13 Jun 2014 15:55:57 +0100 Subject: [PATCH] Revert "Fixed incorrect return code handling in ssl3_final_finish_mac" This reverts commit e05282f8b0b6c6ea063267eb86c4d6b4702c41a1. Missing attribution. --- ssl/s3_enc.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index c44cc9298a..6bc0812162 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -631,18 +631,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, -- 2.25.1