The branch master has been updated
via ab78f89b2df6164826c1efb9aea4bf9edb269644 (commit)
from b379fe6cd046b9dd8a62309dcbaded763e2d4187 (commit)
- Log -----------------------------------------------------------------
commit ab78f89b2df6164826c1efb9aea4bf9edb269644
Author: Matt Caswell <[email protected]>
Date: Fri Aug 25 11:18:23 2017 +0100
Fix no-scrypt
Reviewed-by: Richard Levitte <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/4252)
-----------------------------------------------------------------------
Summary of changes:
test/evp_test.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/test/evp_test.c b/test/evp_test.c
index 9de7fcc..b08114e 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);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
