diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-09-04 13:07:10 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-09-04 14:09:14 -0400 |
| commit | b0809bc8ffb34bf89de9e68d8caeb4d8c2aa08f9 (patch) | |
| tree | 3e1362aa59ccad836c959914db7cbb2fe8e09514 /include | |
| parent | a939b0aab5deb3678308df804d25a340240deee5 (diff) | |
RT3998: Allow scrypt to be disabled
This does 64-bit division and multiplication, and on 32-bit platforms
pulls in libgcc symbols (and MSVC does similar) which may not be
available. Mostly done by David Woodhouse.
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 2 | ||||
| -rw-r--r-- | include/openssl/x509.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index d5333e29fe..374c92663d 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1075,6 +1075,7 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de); +#ifndef OPENSSL_NO_SCRYPT int EVP_PBE_scrypt(const char *pass, size_t passlen, const unsigned char *salt, size_t saltlen, uint64_t N, uint64_t r, uint64_t p, uint64_t maxmem, @@ -1083,6 +1084,7 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, int PKCS5_v2_scrypt_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, ASN1_TYPE *param, const EVP_CIPHER *c, const EVP_MD *md, int en_de); +#endif void PKCS5_PBE_add(void); diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 02138cbc47..da6514d26d 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -1052,10 +1052,12 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, unsigned char *salt, int saltlen, unsigned char *aiv, int prf_nid); +#ifndef OPENSSL_NO_SCRYPT X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher, const unsigned char *salt, int saltlen, unsigned char *aiv, uint64_t N, uint64_t r, uint64_t p); +#endif X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, int prf_nid, int keylen); |