From ab78f89b2df6164826c1efb9aea4bf9edb269644 Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Fri, 25 Aug 2017 11:18:23 +0100
Subject: [PATCH] Fix no-scrypt

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4252)
---
 test/evp_test.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/evp_test.c b/test/evp_test.c
index 9de7fcca6e..b08114e827 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -1639,6 +1639,13 @@ static int kdf_test_init(EVP_TEST *t, const char *name)
     KDF_DATA *kdata;
     int kdf_nid = OBJ_sn2nid(name);
 
+#ifdef OPENSSL_NO_SCRYPT
+    if (strcmp(name, "scrypt") == 0) {
+        t->skip = 1;
+        return 1;
+    }
+#endif
+
     if (kdf_nid == NID_undef)
         kdf_nid = OBJ_ln2nid(name);
 
-- 
2.34.1