From 89b378c4b34c70b60981e17ea385f14c9e285912 Mon Sep 17 00:00:00 2001 From: jkim Date: Tue, 8 Apr 2014 21:06:58 +0000 Subject: Merge OpenSSL 1.0.1g. Approved by: benl (maintainer) --- crypto/openssl/ssl/t1_enc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crypto/openssl/ssl/t1_enc.c') diff --git a/crypto/openssl/ssl/t1_enc.c b/crypto/openssl/ssl/t1_enc.c index 56db834..0c4cdde 100644 --- a/crypto/openssl/ssl/t1_enc.c +++ b/crypto/openssl/ssl/t1_enc.c @@ -986,7 +986,8 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send) } else { - EVP_MD_CTX_copy(&hmac,hash); + if (!EVP_MD_CTX_copy(&hmac,hash)) + return -1; mac_ctx = &hmac; } -- cgit v1.1