diff options
| author | Johannes Bauer <joe@johannes-bauer.com> | 2017-08-08 18:51:41 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-08-08 20:50:44 +0100 |
| commit | 402f26e6ee56ec295e053d1f6455e910ac398149 (patch) | |
| tree | 27db406c3255fda1efe80354084b0ca5452909e5 /apps/pkcs12.c | |
| parent | 5d09b003c080d81ff6adfb6c54be5c018a2ba294 (diff) | |
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 <rsalz@openssl.org>
Reviewed-by: Stephen Henson <steve@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4116)
Diffstat (limited to 'apps/pkcs12.c')
| -rw-r--r-- | apps/pkcs12.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 { |