From: Richard Levitte <levitte@openssl.org>
Date: Fri, 25 Sep 2020 13:58:02 +0000 (+0200)
Subject: STORE: Clear a couple of TODOs that were there for the sake of SM2
X-Git-Tag: openssl-3.0.0-alpha7~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c27ee6e056257ab872598bb2a410b23f6c411a0;p=thirdparty%2Fopenssl.git

STORE: Clear a couple of TODOs that were there for the sake of SM2

We now have decoder support for SM2, so the cheats that were in place
for the sake of lacking decoders aren't needed any more.

Fixes #12982

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12986)
---

diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c
index a309acc1154..c3f21eedadc 100644
--- a/crypto/store/store_result.c
+++ b/crypto/store/store_result.c
@@ -337,20 +337,6 @@ static EVP_PKEY *try_key_value_legacy(struct extracted_param_data_st *data,
                 pk = EVP_PKCS82PKEY_with_libctx(p8info, libctx, propq);
                 PKCS8_PRIV_KEY_INFO_free(p8info);
             }
-
-            /*
-             * It wasn't PKCS#8, so we must try the hard way.
-             * However, we can cheat a little bit, because we know
-             * what's not yet fully supported in out decoders.
-             * TODO(3.0) Eliminate these when we have decoder support.
-             */
-            if (pk == NULL) {
-                derp = der;
-                pk = d2i_PrivateKey_ex(EVP_PKEY_SM2, NULL,
-                                       &derp, der_len,
-                                       libctx, NULL);
-                RESET_ERR_MARK();
-            }
         }
 
         if (pk != NULL)
@@ -360,19 +346,6 @@ static EVP_PKEY *try_key_value_legacy(struct extracted_param_data_st *data,
         der = data->octet_data;
         der_len = (long)data->octet_data_size;
     }
-
-    /*
-     * Last, we try parameters.  We cheat the same way we do for
-     * private keys above.
-     * TODO(3.0) Eliminate these when we have decoder support.
-     */
-    if (pk == NULL) {
-        derp = der;
-        pk = d2i_KeyParams(EVP_PKEY_SM2, NULL, &derp, der_len);
-        RESET_ERR_MARK();
-        if (pk != NULL)
-            *store_info_new = OSSL_STORE_INFO_new_PARAMS;
-    }
     CLEAR_ERR_MARK();
 
     return pk;