From: Paul Yang <kaishen.yy@antfin.com>
Date: Mon, 28 Oct 2019 12:14:53 +0000 (+0800)
Subject: Suppress an error when doing SM2 sign/verify ops
X-Git-Tag: OpenSSL_1_1_1e~166
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9cebf0d179e9a2baadabbac1f310c053ce4b8e57;p=oweals%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10278)
---

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;
     }