[openssl] OpenSSL_1_1_1-stable update

[kaishen.yy at antfin.com]

The branch OpenSSL_1_1_1-stable has been updated
       via  9cebf0d179e9a2baadabbac1f310c053ce4b8e57 (commit)
      from  325c9ac198c822ca634a12d3856341c5044c66d0 (commit)


- Log -----------------------------------------------------------------
commit 9cebf0d179e9a2baadabbac1f310c053ce4b8e57
Author: Paul Yang <kaishen.yy at antfin.com>
Date:   Mon Oct 28 20:14:53 2019 +0800

    Suppress an error when doing SM2 sign/verify ops
    
    This was fixed in #8321 right after the 1.1.1 was released but never
    back ported to 1.1.1. Now fix it.
    
    Issue reported from lua-openssl project.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10278)

-----------------------------------------------------------------------

Summary of changes:
 crypto/sm2/sm2_pmeth.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/sm2/sm2_pmeth.c b/crypto/sm2/sm2_pmeth.c
index 62a5b5534d..b42a14c32f 100644
--- a/crypto/sm2/sm2_pmeth.c
+++ b/crypto/sm2/sm2_pmeth.c
@@ -220,6 +220,10 @@ static int pkey_sm2_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
         *(size_t *)p2 = smctx->id_len;
         return 1;
 
+    case EVP_PKEY_CTRL_DIGESTINIT:
+        /* nothing to be inited, this is to suppress the error... */
+        return 1;
+
     default:
         return -2;
     }