diff options
| author | Steven Fackler <[email protected]> | 2018-02-14 22:04:29 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2018-02-14 22:11:24 -0800 |
| commit | f4ddd66b0314fa6d5f8eda9d1a13167612376c81 (patch) | |
| tree | 7fae739c5340afb3ce177f782f8b9c5c8c104283 /openssl/src/pkcs5.rs | |
| parent | Set ossl110 when version is 1.1.1 (diff) | |
| download | rust-openssl-f4ddd66b0314fa6d5f8eda9d1a13167612376c81.tar.xz rust-openssl-f4ddd66b0314fa6d5f8eda9d1a13167612376c81.zip | |
Tweak features
We should keep the version features totally separate for now.
Diffstat (limited to 'openssl/src/pkcs5.rs')
| -rw-r--r-- | openssl/src/pkcs5.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/src/pkcs5.rs b/openssl/src/pkcs5.rs index 926e5438..7253837f 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 OpenSSL 1.1.0 or 1.1.1 and the corresponding Cargo feature. -#[cfg(all(feature = "v110", ossl110))] +#[cfg(any(all(feature = "v110", ossl110), all(feature = "v111", ossl111)))] pub fn scrypt( pass: &[u8], salt: &[u8], @@ -271,7 +271,7 @@ mod tests { } #[test] - #[cfg(all(feature = "v110", ossl110))] + #[cfg(any(all(feature = "v110", ossl110), all(feature = "v111", ossl111)))] fn scrypt() { use hex; |