aboutsummaryrefslogtreecommitdiff
path: root/openssl/ssl/s3_enc.c
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/ssl/s3_enc.c')
-rw-r--r--openssl/ssl/s3_enc.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/openssl/ssl/s3_enc.c b/openssl/ssl/s3_enc.c
index e3cd4f062..996267725 100644
--- a/openssl/ssl/s3_enc.c
+++ b/openssl/ssl/s3_enc.c
@@ -642,10 +642,18 @@ 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;
+ int ret, sha1len;
ret=ssl3_handshake_mac(s,NID_md5,sender,len,p);
+ if(ret == 0)
+ return 0;
+
p+=ret;
- ret+=ssl3_handshake_mac(s,NID_sha1,sender,len,p);
+
+ sha1len=ssl3_handshake_mac(s,NID_sha1,sender,len,p);
+ if(sha1len == 0)
+ return 0;
+
+ ret+=sha1len;
return(ret);
}
static int ssl3_handshake_mac(SSL *s, int md_nid,