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/symm.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/symm.rs')
| -rw-r--r-- | openssl/src/symm.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openssl/src/symm.rs b/openssl/src/symm.rs index 9129b061..7863fafb 100644 --- a/openssl/src/symm.rs +++ b/openssl/src/symm.rs @@ -142,13 +142,13 @@ impl Cipher { } /// Requires OpenSSL 1.1.0 or 1.1.1 and the corresponding Cargo feature. - #[cfg(all(ossl110, feature = "v110"))] + #[cfg(any(all(ossl110, feature = "v110"), all(ossl111, feature = "v111")))] pub fn chacha20() -> Cipher { unsafe { Cipher(ffi::EVP_chacha20()) } } /// Requires OpenSSL 1.1.0 or 1.1.1 and the corresponding Cargo feature. - #[cfg(all(ossl110, feature = "v110"))] + #[cfg(any(all(ossl110, feature = "v110"), all(ossl111, feature = "v111")))] pub fn chacha20_poly1305() -> Cipher { unsafe { Cipher(ffi::EVP_chacha20_poly1305()) } } @@ -968,7 +968,7 @@ mod tests { } #[test] - #[cfg(all(ossl110, feature = "v110"))] + #[cfg(any(all(ossl110, feature = "v110"), all(ossl111, feature = "v111")))] fn test_chacha20() { let key = "0000000000000000000000000000000000000000000000000000000000000000"; let iv = "00000000000000000000000000000000"; @@ -983,7 +983,7 @@ mod tests { } #[test] - #[cfg(all(ossl110, feature = "v110"))] + #[cfg(any(all(ossl110, feature = "v110"), all(ossl111, feature = "v111")))] fn test_chacha20_poly1305() { let key = "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f"; let iv = "070000004041424344454647"; |