Commit 043fd646 authored by Matt Caswell's avatar Matt Caswell
Browse files

Revert "Fixed incorrect return code handling in ssl3_final_finish_mac" 

This reverts commit 2f1dffa8.

Missing attribution.
parent a09e4d24

ssl/s3_enc.c

+2 −10
Original line number Diff line number Diff line
@@ -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,