Merge pull request #1910 from oskirby/conditional-rc4-check

Check for OPENSSL_NO_RC4 when using EVP_rc4
sfackler · Apr 26, 2023 · 03abc17 · 03abc17
2 parents e96adda + 34260b8
commit 03abc17
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/openssl-sys/build/expando.c b/openssl-sys/build/expando.c
@@ -79,6 +79,10 @@ RUST_CONF_OPENSSL_NO_OCSP
 RUST_CONF_OPENSSL_NO_PSK
 #endif
 
+#ifdef OPENSSL_NO_RC4
+RUST_CONF_OPENSSL_NO_RC4
+#endif
+
 #ifdef OPENSSL_NO_RFC3779
 RUST_CONF_OPENSSL_NO_RFC3779
 #endif

diff --git a/openssl-sys/src/handwritten/evp.rs b/openssl-sys/src/handwritten/evp.rs
@@ -311,6 +311,7 @@ extern "C" {
     pub fn EVP_des_ede3_cbc() -> *const EVP_CIPHER;
     pub fn EVP_des_ede3_cfb64() -> *const EVP_CIPHER;
     pub fn EVP_des_cbc() -> *const EVP_CIPHER;
+    #[cfg(not(osslconf = "OPENSSL_NO_RC4"))]
     pub fn EVP_rc4() -> *const EVP_CIPHER;
     pub fn EVP_bf_ecb() -> *const EVP_CIPHER;
     pub fn EVP_bf_cbc() -> *const EVP_CIPHER;

diff --git a/openssl/src/cipher.rs b/openssl/src/cipher.rs
@@ -324,6 +324,7 @@ impl Cipher {
         unsafe { CipherRef::from_ptr(ffi::EVP_des_ede3_cfb64() as *mut _) }
     }
 
+    #[cfg(not(osslconf = "OPENSSL_NO_RC4"))]
     pub fn rc4() -> &'static CipherRef {
         unsafe { CipherRef::from_ptr(ffi::EVP_rc4() as *mut _) }
     }

diff --git a/openssl/src/symm.rs b/openssl/src/symm.rs
@@ -283,6 +283,7 @@ impl Cipher {
         unsafe { Cipher(ffi::EVP_des_ede3_cfb64()) }
     }
 
+    #[cfg(not(osslconf = "OPENSSL_NO_RC4"))]
     pub fn rc4() -> Cipher {
         unsafe { Cipher(ffi::EVP_rc4()) }
     }