diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 12:26:41 -0500 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 13:07:24 -0500 |
| commit | 4668cbfa14460fbead98ec3a904a58df1f41c4c3 (patch) | |
| tree | 72b1fec2e5bfb8ea8ffad514d923c65e9ef38135 /openssl/ssl/s3_enc.c | |
| parent | 15915c262c1334282d0ab2a3fdb2c416e91b51cf (diff) | |
| download | vcxsrv-4668cbfa14460fbead98ec3a904a58df1f41c4c3.tar.gz vcxsrv-4668cbfa14460fbead98ec3a904a58df1f41c4c3.tar.bz2 vcxsrv-4668cbfa14460fbead98ec3a904a58df1f41c4c3.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); |