diff options
| author | jkim <jkim@FreeBSD.org> | 2014-04-08 21:06:58 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-04-08 21:06:58 +0000 |
| commit | 89b378c4b34c70b60981e17ea385f14c9e285912 (patch) | |
| tree | 782ade2dc94388e4ddc56b20d9c7ccf578d61077 /crypto/openssl/ssl/t1_enc.c | |
| parent | 808e531530813c805e5f01db2b51e22340fd77a6 (diff) | |
| download | FreeBSD-src-89b378c4b34c70b60981e17ea385f14c9e285912.zip FreeBSD-src-89b378c4b34c70b60981e17ea385f14c9e285912.tar.gz | |
Merge OpenSSL 1.0.1g.
Approved by: benl (maintainer)
Diffstat (limited to 'crypto/openssl/ssl/t1_enc.c')
| -rw-r--r-- | crypto/openssl/ssl/t1_enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |
