[openssl] master update

beldmit at gmail.com beldmit at gmail.com
Wed Jul 22 07:38:50 UTC 2020

The branch master has been updated
       via  1d864f0f534fe38541c7adba5777935a0f2a2eb9 (commit)
      from  490c87110cc1fd673604fa1b94d5538f9fd852bb (commit)

- Log -----------------------------------------------------------------
commit 1d864f0f534fe38541c7adba5777935a0f2a2eb9
Author: gujinqiang <gujinqiangggs at 126.com>
Date:   Fri Jul 17 17:52:26 2020 +0800

    Specific the engine pointer
    CLA: trivial
    I found that when I wanted to use an engine by the option-engine XXX , it didn't work. Checking the code, I guess it missed the engine pointer when calling EVP_CipherInit_ex.
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Paul Yang <kaishen.yy at antfin.com>
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/12475)


Summary of changes:
 apps/enc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/enc.c b/apps/enc.c
index 4d59391c22..0f4cdae3c2 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -551,7 +551,7 @@ int enc_main(int argc, char **argv)
         BIO_get_cipher_ctx(benc, &ctx);
-        if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc)) {
+        if (!EVP_CipherInit_ex(ctx, cipher, e, NULL, NULL, enc)) {
             BIO_printf(bio_err, "Error setting cipher %s\n",

More information about the openssl-commits mailing list