From: Paul Yang <kaishen.yy@antfin.com>
Date: Thu, 12 Sep 2019 08:57:23 +0000 (+0800)
Subject: Fix test error if scrypt is disabled
X-Git-Tag: openssl-3.0.0-alpha1~1390
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=98b687f8d053662f8d7fee586d5a91d86fecdfee;p=oweals%2Fopenssl.git

Fix test error if scrypt is disabled

Fix no-scrypt.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9840)
---

diff --git a/test/evp_test.c b/test/evp_test.c
index 67a818d98d..69ccb9739e 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -1989,7 +1989,8 @@ static int kdf_test_init(EVP_TEST *t, const char *name)
     EVP_KDF *kdf;
 
 #ifdef OPENSSL_NO_SCRYPT
-    if (strcmp(name, "scrypt") == 0) {
+    /* TODO(3.0) Replace with "scrypt" once aliases are supported */
+    if (strcmp(name, "id-scrypt") == 0) {
         t->skip = 1;
         return 1;
     }