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 /crypto | |
| parent | 5d09b003c080d81ff6adfb6c54be5c018a2ba294 (diff) | |
| download | openssl-402f26e6ee56ec295e053d1f6455e910ac398149.tar.gz | |
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 'crypto')
| -rw-r--r-- | crypto/kdf/scrypt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/kdf/scrypt.c b/crypto/kdf/scrypt.c index c7aa823e49..3f4cf385db 100644 --- a/crypto/kdf/scrypt.c +++ b/crypto/kdf/scrypt.c @@ -15,6 +15,8 @@ #include "internal/cryptlib.h" #include "internal/evp_int.h" +#ifndef OPENSSL_NO_SCRYPT + static int atou64(const char *nptr, uint64_t *result); typedef struct { @@ -256,3 +258,5 @@ const EVP_PKEY_METHOD scrypt_pkey_meth = { pkey_scrypt_ctrl, pkey_scrypt_ctrl_str }; + +#endif |