Revert "Fixed incorrect return code handling in ssl3_final_finish_mac"
authorMatt Caswell <matt@openssl.org>
Fri, 13 Jun 2014 14:35:20 +0000 (15:35 +0100)
committerMatt Caswell <matt@openssl.org>
Fri, 13 Jun 2014 14:35:20 +0000 (15:35 +0100)
This reverts commit 2f1dffa88e1b120add4f0b3a794fbca65aa7768d.

Missing attribution.

ssl/s3_enc.c

index 6c103a0..f1b2641 100644 (file)
@@ -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,