summaryrefslogtreecommitdiffstats
path: root/test/evp_test.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/evp_test.c')
-rw-r--r--test/evp_test.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/test/evp_test.c b/test/evp_test.c
index b70b4ea600..0489bbe093 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -1965,7 +1965,14 @@ static int kdf_test_init(EVP_TEST *t, const char *name)
t->skip = 1;
return 1;
}
-#endif
+#endif /* OPENSSL_NO_SCRYPT */
+
+#ifdef OPENSSL_NO_CMS
+ if (strcmp(name, "X942KDF") == 0) {
+ t->skip = 1;
+ return 1;
+ }
+#endif /* OPENSSL_NO_CMS */
kdf = EVP_get_kdfbyname(name);
if (kdf == NULL)
@@ -2097,7 +2104,14 @@ static int pkey_kdf_test_init(EVP_TEST *t, const char *name)
t->skip = 1;
return 1;
}
-#endif
+#endif /* OPENSSL_NO_SCRYPT */
+
+#ifdef OPENSSL_NO_CMS
+ if (strcmp(name, "X942KDF") == 0) {
+ t->skip = 1;
+ return 1;
+ }
+#endif /* OPENSSL_NO_CMS */
if (kdf_nid == NID_undef)
kdf_nid = OBJ_ln2nid(name);