Fix no-sm2

[openssl.git] / test / evp_test.c

diff --git a/test/evp_test.c b/test/evp_test.c
index 3244da6549cc7d8ed80dc084ba639d90f8936ba6..32f843e15664b41fcb40dca883969bae04e582c9 100644 (file)
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -2413,6 +2413,23 @@ static char *take_value(PAIR *pp)
     return p;
 }
 
     return p;
 }
 

+static int key_disabled(EVP_PKEY *pkey)
+{
+#if defined(OPENSSL_NO_SM2) && !defined(OPENSSL_NO_EC)
+    int type = EVP_PKEY_base_id(pkey);
+
+    if (type == EVP_PKEY_EC) {
+        EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey);
+        int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec));
+
+        if (nid == NID_sm2)
+            return 1;
+    }
+#endif /* OPENSSL_NO_SM2 */
+
+    return 0;
+}
+

 /*
  * Read and parse one test.  Return 0 if failure, 1 if okay.
  */
 /*
  * Read and parse one test.  Return 0 if failure, 1 if okay.
  */


@@ -2439,6 +2456,7 @@ top:
     if (strcmp(pp->key, "PrivateKey") == 0) {
         pkey = PEM_read_bio_PrivateKey(t->s.key, NULL, 0, NULL);
         if (pkey == NULL && !key_unsupported()) {
     if (strcmp(pp->key, "PrivateKey") == 0) {
         pkey = PEM_read_bio_PrivateKey(t->s.key, NULL, 0, NULL);
         if (pkey == NULL && !key_unsupported()) {

+            EVP_PKEY_free(pkey);

             TEST_info("Can't read private key %s", pp->value);
             TEST_openssl_errors();
             return 0;
             TEST_info("Can't read private key %s", pp->value);
             TEST_openssl_errors();
             return 0;


@@ -2447,6 +2465,7 @@ top:
     } else if (strcmp(pp->key, "PublicKey") == 0) {
         pkey = PEM_read_bio_PUBKEY(t->s.key, NULL, 0, NULL);
         if (pkey == NULL && !key_unsupported()) {
     } else if (strcmp(pp->key, "PublicKey") == 0) {
         pkey = PEM_read_bio_PUBKEY(t->s.key, NULL, 0, NULL);
         if (pkey == NULL && !key_unsupported()) {

+            EVP_PKEY_free(pkey);

             TEST_info("Can't read public key %s", pp->value);
             TEST_openssl_errors();
             return 0;
             TEST_info("Can't read public key %s", pp->value);
             TEST_openssl_errors();
             return 0;


@@ -2497,6 +2516,10 @@ top:
         }
         OPENSSL_free(keybin);
     }
         }
         OPENSSL_free(keybin);
     }

+    if (pkey != NULL && key_disabled(pkey)) {
+        EVP_PKEY_free(pkey);
+        pkey = NULL;
+    }

 
     /* If we have a key add to list */
     if (klist != NULL) {
 
     /* If we have a key add to list */
     if (klist != NULL) {