[openssl] master update
beldmit at gmail.com
beldmit at gmail.com
Thu Sep 5 13:32:34 UTC 2019
The branch master has been updated
via 464ac47f81c07d5630026d3ce1251da00c469e00 (commit)
from 0220fc9921f0aa3aea43e6b672b8f89b3eb0261a (commit)
- Log -----------------------------------------------------------------
commit 464ac47f81c07d5630026d3ce1251da00c469e00
Author: Dmitry Belyavskiy <beldmit at gmail.com>
Date: Thu Sep 5 15:50:58 2019 +0300
Reverting check to correct
Fixes #9773.
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9776)
-----------------------------------------------------------------------
Summary of changes:
crypto/evp/cmeth_lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/evp/cmeth_lib.c b/crypto/evp/cmeth_lib.c
index 4d823f0f5e..ba61c52564 100644
--- a/crypto/evp/cmeth_lib.c
+++ b/crypto/evp/cmeth_lib.c
@@ -38,7 +38,7 @@ EVP_CIPHER *EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher)
return NULL;
if ((to = EVP_CIPHER_meth_new(cipher->nid, cipher->block_size,
- cipher->key_len)) == NULL) {
+ cipher->key_len)) != NULL) {
CRYPTO_RWLOCK *lock = to->lock;
memcpy(to, cipher, sizeof(*to));
More information about the openssl-commits
mailing list