Fix no-scrypt

[openssl.git] / test / evp_test.c

diff --git a/test/evp_test.c b/test/evp_test.c
index 3875081c39096039d789fd860b7db8d892ca973c..b08114e827c2069335ed66fe7ab85e32b3747dd5 100644 (file)
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -1302,7 +1302,7 @@ static int parse_uint64(const char *value, uint64_t *pr)
             return -1;
         }
         *pr *= 10;
-        if (!TEST_true(isdigit(*p))) {
+        if (!TEST_true(isdigit((unsigned char)*p))) {
             TEST_error("Invalid character in string %s", value);
             return -1;
         }
@@ -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);