Unverified Commit 942b2fd6 authored Oct 23, 2023 by Alex Gaynor Committed by GitHub Oct 23, 2023

Merge pull request #2071 from GuyLewin/master

Support OPENSSL_NO_SCRYPT

parents 2fb393ee 0e60f5dc

openssl-sys/build/expando.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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

openssl/src/pkcs5.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -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],