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) --- apps/pkcs12.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'apps') diff --git a/apps/pkcs12.c b/apps/pkcs12.c index e8c1c87cb3..209aa33d1b 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -819,6 +819,7 @@ static int alg_print(const X509_ALGOR *alg) BIO_printf(bio_err, ", Iteration %ld, PRF %s", ASN1_INTEGER_get(kdf->iter), OBJ_nid2sn(prfnid)); PBKDF2PARAM_free(kdf); +#ifndef OPENSSL_NO_SCRYPT } else if (pbenid == NID_id_scrypt) { SCRYPT_PARAMS *kdf = NULL; @@ -835,6 +836,7 @@ static int alg_print(const X509_ALGOR *alg) ASN1_INTEGER_get(kdf->blockSize), ASN1_INTEGER_get(kdf->parallelizationParameter)); SCRYPT_PARAMS_free(kdf); +#endif } PBE2PARAM_free(pbe2); } else { -- cgit v1.2.3