RT3998: Allow scrypt to be disabled

[openssl.git] / crypto / asn1 / p5_scrypt.c

diff --git a/crypto/asn1/p5_scrypt.c b/crypto/asn1/p5_scrypt.c
index 5c4de797f98fb49b6a2eb6638d3645a048b28b70..35ff396566ca2807d7e44b6091b2ebcdfeaa14be 100644 (file)
--- a/crypto/asn1/p5_scrypt.c
+++ b/crypto/asn1/p5_scrypt.c
@@ -65,6 +65,7 @@
 #include <openssl/x509.h>
 #include <openssl/rand.h>
 
 #include <openssl/x509.h>
 #include <openssl/rand.h>
 

+#ifndef OPENSSL_NO_SCRYPT

 /* PKCS#5 scrypt password based encryption structures */
 
 typedef struct {
 /* PKCS#5 scrypt password based encryption structures */
 
 typedef struct {


@@ -330,3 +331,4 @@ int PKCS5_v2_scrypt_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass,
     SCRYPT_PARAMS_free(sparam);
     return rv;
 }
     SCRYPT_PARAMS_free(sparam);
     return rv;
 }

+#endif /* OPENSSL_NO_SCRYPT */