diff options
| author | jkim <jkim@FreeBSD.org> | 2015-01-08 23:42:41 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-01-08 23:42:41 +0000 |
| commit | 4f9b1cef1a6825f03178937e0feb39a2b2d046c8 (patch) | |
| tree | 6c2f3cb14d70e0247fe500835bed3d3588c3025e /crypto/openssl/ssl/s3_enc.c | |
| parent | cfd5b20c8bb6e3677ef84152d28058c0ead0de39 (diff) | |
| parent | a350427e88bc6ff288594c964ca0f57464062eb0 (diff) | |
| download | FreeBSD-src-4f9b1cef1a6825f03178937e0feb39a2b2d046c8.zip FreeBSD-src-4f9b1cef1a6825f03178937e0feb39a2b2d046c8.tar.gz | |
Merge OpenSSL 1.0.1k.
Diffstat (limited to 'crypto/openssl/ssl/s3_enc.c')
| -rw-r--r-- | crypto/openssl/ssl/s3_enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s3_enc.c b/crypto/openssl/ssl/s3_enc.c index 9db45af..89c133e 100644 --- a/crypto/openssl/ssl/s3_enc.c +++ b/crypto/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); |
