diff options
| author | Matt Caswell <matt@openssl.org> | 2017-08-25 11:18:23 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-08-25 14:54:28 +0100 |
| commit | ab78f89b2df6164826c1efb9aea4bf9edb269644 (patch) | |
| tree | 80521352a47ccc615d6f470fa1e97dab2e845718 /test/evp_test.c | |
| parent | b379fe6cd046b9dd8a62309dcbaded763e2d4187 (diff) | |
Fix no-scrypt
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4252)
Diffstat (limited to 'test/evp_test.c')
| -rw-r--r-- | test/evp_test.c | 7 |
1 files changed, 7 insertions, 0 deletions
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); |