From 61abe85503549fc75e4e1e20e28ef905c1b6db6a Mon Sep 17 00:00:00 2001 From: Ruslan Sayfutdinov Date: Fri, 4 Dec 2020 14:51:53 +0000 Subject: [PATCH] Support OPENSSL_NO_RMD160, OPENSSL_NO_CMS, OPENSSL_NO_BF --- openssl/src/hash.rs | 1 + openssl/src/lib.rs | 2 +- openssl/src/symm.rs | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/openssl/src/hash.rs b/openssl/src/hash.rs index 1136b6b14..4f8fe3762 100644 --- a/openssl/src/hash.rs +++ b/openssl/src/hash.rs @@ -104,6 +104,7 @@ impl MessageDigest { unsafe { MessageDigest(ffi::EVP_shake256()) } } + #[cfg(not(osslconf = "OPENSSL_NO_RMD160"))] pub fn ripemd160() -> MessageDigest { unsafe { MessageDigest(ffi::EVP_ripemd160()) } } diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs index b4e647c07..07ec23c95 100644 --- a/openssl/src/lib.rs +++ b/openssl/src/lib.rs @@ -143,7 +143,7 @@ pub mod aes; pub mod asn1; pub mod base64; pub mod bn; -#[cfg(not(libressl))] +#[cfg(all(not(libressl), not(osslconf = "OPENSSL_NO_CMS")))] pub mod cms; pub mod conf; pub mod derive; diff --git a/openssl/src/symm.rs b/openssl/src/symm.rs index 45c5dd9b3..beea446b5 100644 --- a/openssl/src/symm.rs +++ b/openssl/src/symm.rs @@ -224,18 +224,22 @@ impl Cipher { unsafe { Cipher(ffi::EVP_aes_256_ocb()) } } + #[cfg(not(osslconf = "OPENSSL_NO_BF"))] pub fn bf_cbc() -> Cipher { unsafe { Cipher(ffi::EVP_bf_cbc()) } } + #[cfg(not(osslconf = "OPENSSL_NO_BF"))] pub fn bf_ecb() -> Cipher { unsafe { Cipher(ffi::EVP_bf_ecb()) } } + #[cfg(not(osslconf = "OPENSSL_NO_BF"))] pub fn bf_cfb64() -> Cipher { unsafe { Cipher(ffi::EVP_bf_cfb64()) } } + #[cfg(not(osslconf = "OPENSSL_NO_BF"))] pub fn bf_ofb() -> Cipher { unsafe { Cipher(ffi::EVP_bf_ofb()) } } -- GitLab