aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/symm.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/symm.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/symm.rs')
-rw-r--r--openssl/src/symm.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/openssl/src/symm.rs b/openssl/src/symm.rs
index e109b2a7..84a91d77 100644
--- a/openssl/src/symm.rs
+++ b/openssl/src/symm.rs
@@ -138,13 +138,13 @@ impl Cipher {
}
/// Requires the `v110` feature and OpenSSL 1.1.0.
- #[cfg(all(ossl110, feature = "v110"))]
+ #[cfg(all(ossl11x, feature = "v110"))]
pub fn chacha20() -> Cipher {
unsafe { Cipher(ffi::EVP_chacha20()) }
}
/// Requires the `v110` feature and OpenSSL 1.1.0.
- #[cfg(all(ossl110, feature = "v110"))]
+ #[cfg(all(ossl11x, feature = "v110"))]
pub fn chacha20_poly1305() -> Cipher {
unsafe { Cipher(ffi::EVP_chacha20_poly1305()) }
}
@@ -589,7 +589,7 @@ pub fn decrypt_aead(
Ok(out)
}
-#[cfg(ossl110)]
+#[cfg(ossl11x)]
use ffi::{EVP_CIPHER_iv_length, EVP_CIPHER_block_size, EVP_CIPHER_key_length};
#[cfg(ossl10x)]
@@ -1076,7 +1076,7 @@ mod tests {
}
#[test]
- #[cfg(all(ossl110, feature = "v110"))]
+ #[cfg(all(ossl11x, feature = "v110"))]
fn test_chacha20() {
let key = "0000000000000000000000000000000000000000000000000000000000000000";
let iv = "00000000000000000000000000000000";
@@ -1089,7 +1089,7 @@ mod tests {
}
#[test]
- #[cfg(all(ossl110, feature = "v110"))]
+ #[cfg(all(ossl11x, feature = "v110"))]
fn test_chacha20_poly1305() {
let key = "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f";
let iv = "070000004041424344454647";