projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b379fe6
)
Fix no-scrypt
author
Matt Caswell
<matt@openssl.org>
Fri, 25 Aug 2017 10:18:23 +0000
(11:18 +0100)
committer
Matt Caswell
<matt@openssl.org>
Fri, 25 Aug 2017 13:54:28 +0000
(14:54 +0100)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4252)
test/evp_test.c
patch
|
blob
|
history
diff --git
a/test/evp_test.c
b/test/evp_test.c
index 9de7fcca6e00c22c327ee1578ca4f8f305379cf7..b08114e827c2069335ed66fe7ab85e32b3747dd5 100644
(file)
--- 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);