From 0e60f5dc1eafed89e2e758ce1b4044bc59ccb7f3 Mon Sep 17 00:00:00 2001
From: Guy Lewin <guyl@fb.com>
Date: Mon, 23 Oct 2023 16:21:57 -0400
Subject: [PATCH] Support OPENSSL_NO_SCRYPT

---
 openssl-sys/build/expando.c | 4 ++++
 openssl/src/pkcs5.rs        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/openssl-sys/build/expando.c b/openssl-sys/build/expando.c
index cd7456b4f0..e171621dca 100644
--- a/openssl-sys/build/expando.c
+++ b/openssl-sys/build/expando.c
@@ -134,3 +134,7 @@ RUST_CONF_OPENSSL_NO_DEPRECATED_3_0
 #ifdef OPENSSL_NO_SEED
 RUST_CONF_OPENSSL_NO_SEED
 #endif
+
+#ifdef OPENSSL_NO_SCRYPT
+RUST_CONF_OPENSSL_NO_SCRYPT
+#endif
diff --git a/openssl/src/pkcs5.rs b/openssl/src/pkcs5.rs
index cd704e8256..afaae55a29 100644
--- a/openssl/src/pkcs5.rs
+++ b/openssl/src/pkcs5.rs
@@ -115,7 +115,7 @@ pub fn pbkdf2_hmac(
 ///
 /// Requires OpenSSL 1.1.0 or newer.
 #[corresponds(EVP_PBE_scrypt)]
-#[cfg(any(ossl110, boringssl))]
+#[cfg(all(any(ossl110, boringssl), not(osslconf = "OPENSSL_NO_SCRYPT")))]
 #[allow(clippy::useless_conversion)]
 pub fn scrypt(
     pass: &[u8],