diff --git a/openssl-sys/src/handwritten/evp.rs b/openssl-sys/src/handwritten/evp.rs index e8ad6aa2d7..96cc814cc2 100644 --- a/openssl-sys/src/handwritten/evp.rs +++ b/openssl-sys/src/handwritten/evp.rs @@ -396,23 +396,33 @@ extern "C" { #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAMELLIA")))] pub fn EVP_camellia_128_ecb() -> *const EVP_CIPHER; #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAMELLIA")))] + pub fn EVP_camellia_128_cbc() -> *const EVP_CIPHER; + #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAMELLIA")))] pub fn EVP_camellia_192_cfb128() -> *const EVP_CIPHER; #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAMELLIA")))] pub fn EVP_camellia_192_ecb() -> *const EVP_CIPHER; #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAMELLIA")))] + pub fn EVP_camellia_192_cbc() -> *const EVP_CIPHER; + #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAMELLIA")))] pub fn EVP_camellia_256_cfb128() -> *const EVP_CIPHER; #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAMELLIA")))] pub fn EVP_camellia_256_ecb() -> *const EVP_CIPHER; + #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAMELLIA")))] + pub fn EVP_camellia_256_cbc() -> *const EVP_CIPHER; #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAST")))] pub fn EVP_cast5_cfb64() -> *const EVP_CIPHER; #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAST")))] pub fn EVP_cast5_ecb() -> *const EVP_CIPHER; + #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAST")))] + pub fn EVP_cast5_cbc() -> *const EVP_CIPHER; #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_IDEA")))] pub fn EVP_idea_cfb64() -> *const EVP_CIPHER; #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_IDEA")))] pub fn EVP_idea_ecb() -> *const EVP_CIPHER; + #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_IDEA")))] + pub fn EVP_idea_cbc() -> *const EVP_CIPHER; #[cfg(not(ossl110))] pub fn OPENSSL_add_all_algorithms_noconf(); diff --git a/openssl/src/symm.rs b/openssl/src/symm.rs index 7ebb70338e..52dc1f0bc6 100644 --- a/openssl/src/symm.rs +++ b/openssl/src/symm.rs @@ -288,6 +288,26 @@ impl Cipher { unsafe { Cipher(ffi::EVP_rc4()) } } + #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAMELLIA")))] + pub fn camellia_128_cbc() -> Cipher { + unsafe { Cipher(ffi::EVP_camellia_128_cbc()) } + } + + #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAMELLIA")))] + pub fn camellia_192_cbc() -> Cipher { + unsafe { Cipher(ffi::EVP_camellia_192_cbc()) } + } + + #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAMELLIA")))] + pub fn camellia_256_cbc() -> Cipher { + unsafe { Cipher(ffi::EVP_camellia_256_cbc()) } + } + + #[cfg(not(osslconf = "OPENSSL_NO_CAST"))] + pub fn cast5_cbc() -> Cipher { + unsafe { Cipher(ffi::EVP_cast5_cbc()) } + } + /// Requires OpenSSL 1.1.0 or newer. #[cfg(all(ossl110, not(osslconf = "OPENSSL_NO_CHACHA")))] pub fn chacha20() -> Cipher { @@ -300,6 +320,11 @@ impl Cipher { unsafe { Cipher(ffi::EVP_chacha20_poly1305()) } } + #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_IDEA")))] + pub fn idea_cbc() -> Cipher { + unsafe { Cipher(ffi::EVP_idea_cbc()) } + } + #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_SEED")))] pub fn seed_cbc() -> Cipher { unsafe { Cipher(ffi::EVP_seed_cbc()) }