diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 12:26:41 -0500 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 15:20:57 -0500 |
| commit | ee914bf036b78dcbde9bf694794c15482d721028 (patch) | |
| tree | 13793fdc02dbf47bd4dd5e93861bccac71d58887 /openssl/ssl/s3_enc.c | |
| parent | faa5026e540d03f858265b2796054d685f687383 (diff) | |
| download | vcxsrv-ee914bf036b78dcbde9bf694794c15482d721028.tar.gz vcxsrv-ee914bf036b78dcbde9bf694794c15482d721028.tar.bz2 vcxsrv-ee914bf036b78dcbde9bf694794c15482d721028.zip | |
Update openssl to version openssl-1.0.1k
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/ssl/s3_enc.c')
| -rw-r--r-- | openssl/ssl/s3_enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openssl/ssl/s3_enc.c b/openssl/ssl/s3_enc.c index 9db45af7e..89c133e68 100644 --- a/openssl/ssl/s3_enc.c +++ b/openssl/ssl/s3_enc.c @@ -535,7 +535,8 @@ int ssl3_enc(SSL *s, int send) /* otherwise, rec->length >= bs */ } - EVP_Cipher(ds,rec->data,rec->input,l); + if(EVP_Cipher(ds,rec->data,rec->input,l) < 1) + return -1; if (EVP_MD_CTX_md(s->read_hash) != NULL) mac_size = EVP_MD_CTX_size(s->read_hash); |