From 402f26e6ee56ec295e053d1f6455e910ac398149 Mon Sep 17 00:00:00 2001 From: Johannes Bauer Date: Tue, 8 Aug 2017 18:51:41 +0200 Subject: Fix building without scrypt Building without the scrypt KDF is now possible, the OPENSSL_NO_SCRYPT define is honored in code. Previous this lead to undefined references. Reviewed-by: Rich Salz Reviewed-by: Stephen Henson (Merged from https://github.com/openssl/openssl/pull/4116) --- test/pkey_meth_kdf_test.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'test/pkey_meth_kdf_test.c') diff --git a/test/pkey_meth_kdf_test.c b/test/pkey_meth_kdf_test.c index a2ad91e40d..c832e8eb12 100644 --- a/test/pkey_meth_kdf_test.c +++ b/test/pkey_meth_kdf_test.c @@ -60,6 +60,7 @@ static int test_kdf_hkdf(void) return 1; } +#ifndef OPENSSL_NO_SCRYPT static int test_kdf_scrypt(void) { EVP_PKEY_CTX *pctx; @@ -126,10 +127,13 @@ static int test_kdf_scrypt(void) EVP_PKEY_CTX_free(pctx); return 1; } +#endif int setup_tests() { ADD_TEST(test_kdf_hkdf); +#ifndef OPENSSL_NO_SCRYPT ADD_TEST(test_kdf_scrypt); +#endif return 1; } -- cgit v1.2.3