]> git.ipfire.org Git - thirdparty/openssl.git/commit
projects / thirdparty / openssl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5d09b00) | patch
Fix building without scrypt
authorJohannes Bauer <joe@johannes-bauer.com>
Tue, 8 Aug 2017 16:51:41 +0000 (18:51 +0200)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 8 Aug 2017 19:50:44 +0000 (20:50 +0100)
commit402f26e6ee56ec295e053d1f6455e910ac398149
tree27db406c3255fda1efe80354084b0ca5452909e5tree | snapshot
parent5d09b003c080d81ff6adfb6c54be5c018a2ba294commit | 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)
apps/pkcs12.c diff | blob | blame | history
crypto/kdf/scrypt.c diff | blob | blame | history
test/pkey_meth_kdf_test.c diff | blob | blame | history
A mirror of the official openssl repository