diff options
| author | Matt Caswell <matt@openssl.org> | 2014-06-13 16:35:20 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2014-06-13 16:35:20 +0200 |
| commit | 043fd6468986e61f7379bc7e989507f639de8d14 (patch) | |
| tree | 4d38cd7ac4d5e4f51275a0453be3712d520494b8 /ssl/s3_enc.c | |
| parent | Client-side namecheck wildcards. (diff) | |
| download | openssl-043fd6468986e61f7379bc7e989507f639de8d14.tar.xz openssl-043fd6468986e61f7379bc7e989507f639de8d14.zip | |
Revert "Fixed incorrect return code handling in ssl3_final_finish_mac"
This reverts commit 2f1dffa88e1b120add4f0b3a794fbca65aa7768d.
Missing attribution.
Diffstat (limited to 'ssl/s3_enc.c')
| -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 6c103a042f..f1b2641853 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, |