Merge pull request #2071 from GuyLewin/master

Support OPENSSL_NO_SCRYPT
sfackler · Oct 23, 2023 · 942b2fd · 942b2fd
2 parents 2fb393e + 0e60f5d
commit 942b2fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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],