aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/pkcs5.rs
diff options
context:
space:
mode:
authorTatsuyuki Ishi <[email protected]>2018-09-25 16:17:12 +0900
committerTatsuyuki Ishi <[email protected]>2018-09-25 22:00:20 +0900
commit3b73dda4b31c2b8ea8417fb6d68e451d2e4b3633 (patch)
tree82bdb5ed14597ed275a4a7459e170872edde34b5 /openssl/src/pkcs5.rs
parentRaise requirement to 1.21.0 (diff)
downloadrust-openssl-0.9.x.tar.xz
rust-openssl-0.9.x.zip
Add support for OpenSSL 1.1.10.9.x
Diffstat (limited to 'openssl/src/pkcs5.rs')
-rw-r--r--openssl/src/pkcs5.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/src/pkcs5.rs b/openssl/src/pkcs5.rs
index b37e4770..a619e11c 100644
--- a/openssl/src/pkcs5.rs
+++ b/openssl/src/pkcs5.rs
@@ -108,7 +108,7 @@ pub fn pbkdf2_hmac(
/// Derives a key from a password and salt using the scrypt algorithm.
///
/// Requires the `v110` feature and OpenSSL 1.1.0.
-#[cfg(all(feature = "v110", ossl110))]
+#[cfg(all(feature = "v110", ossl11x))]
pub fn scrypt(
pass: &[u8],
salt: &[u8],
@@ -546,7 +546,7 @@ mod tests {
}
#[test]
- #[cfg(all(feature = "v110", ossl110))]
+ #[cfg(all(feature = "v110", ossl11x))]
fn scrypt() {
use hex::ToHex;