Unverified Commit c0f1442b authored by Alex Gaynor's avatar Alex Gaynor Committed by GitHub
Browse files

Merge pull request #2361 from alex/rc2 

Expose rc2 ciphers on symm::Cipher
parents a4d399b0 ae495dc2

openssl-sys/build/expando.c

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ RUST_CONF_OPENSSL_NO_PSK 
RUST_CONF_OPENSSL_NO_RC4

#endif



#ifdef OPENSSL_NO_RC2

RUST_CONF_OPENSSL_NO_RC2

#endif



#ifdef OPENSSL_NO_RFC3779

RUST_CONF_OPENSSL_NO_RFC3779

#endif

openssl-sys/build/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ fn check_ssl_kind() { 
}



fn main() {

    println!("cargo:rustc-check-cfg=cfg(osslconf, values(\"OPENSSL_NO_OCB\", \"OPENSSL_NO_SM4\", \"OPENSSL_NO_SEED\", \"OPENSSL_NO_CHACHA\", \"OPENSSL_NO_CAST\", \"OPENSSL_NO_IDEA\", \"OPENSSL_NO_CAMELLIA\", \"OPENSSL_NO_RC4\", \"OPENSSL_NO_BF\", \"OPENSSL_NO_PSK\", \"OPENSSL_NO_DEPRECATED_3_0\", \"OPENSSL_NO_SCRYPT\", \"OPENSSL_NO_SM3\", \"OPENSSL_NO_RMD160\", \"OPENSSL_NO_EC2M\", \"OPENSSL_NO_OCSP\", \"OPENSSL_NO_CMS\", \"OPENSSL_NO_COMP\", \"OPENSSL_NO_SOCK\", \"OPENSSL_NO_STDIO\", \"OPENSSL_NO_EC\", \"OPENSSL_NO_SSL3_METHOD\", \"OPENSSL_NO_KRB5\", \"OPENSSL_NO_TLSEXT\", \"OPENSSL_NO_SRP\", \"OPENSSL_NO_RFC3779\", \"OPENSSL_NO_SHA\", \"OPENSSL_NO_NEXTPROTONEG\", \"OPENSSL_NO_ENGINE\", \"OPENSSL_NO_BUF_FREELISTS\"))");

    println!("cargo:rustc-check-cfg=cfg(osslconf, values(\"OPENSSL_NO_OCB\", \"OPENSSL_NO_SM4\", \"OPENSSL_NO_SEED\", \"OPENSSL_NO_CHACHA\", \"OPENSSL_NO_CAST\", \"OPENSSL_NO_IDEA\", \"OPENSSL_NO_CAMELLIA\", \"OPENSSL_NO_RC4\", \"OPENSSL_NO_BF\", \"OPENSSL_NO_PSK\", \"OPENSSL_NO_DEPRECATED_3_0\", \"OPENSSL_NO_SCRYPT\", \"OPENSSL_NO_SM3\", \"OPENSSL_NO_RMD160\", \"OPENSSL_NO_EC2M\", \"OPENSSL_NO_OCSP\", \"OPENSSL_NO_CMS\", \"OPENSSL_NO_COMP\", \"OPENSSL_NO_SOCK\", \"OPENSSL_NO_STDIO\", \"OPENSSL_NO_EC\", \"OPENSSL_NO_SSL3_METHOD\", \"OPENSSL_NO_KRB5\", \"OPENSSL_NO_TLSEXT\", \"OPENSSL_NO_SRP\", \"OPENSSL_NO_RFC3779\", \"OPENSSL_NO_SHA\", \"OPENSSL_NO_NEXTPROTONEG\", \"OPENSSL_NO_ENGINE\", \"OPENSSL_NO_BUF_FREELISTS\", \"OPENSSL_NO_RC2\"))");



    println!("cargo:rustc-check-cfg=cfg(openssl)");

    println!("cargo:rustc-check-cfg=cfg(libressl)");

openssl-sys/src/handwritten/evp.rs

+5 −0
Original line number Diff line number Diff line
@@ -440,6 +440,11 @@ extern "C" { 
    #[cfg(not(osslconf = "OPENSSL_NO_IDEA"))]

    pub fn EVP_idea_ofb() -> *const EVP_CIPHER;



    #[cfg(not(osslconf = "OPENSSL_NO_RC2"))]

    pub fn EVP_rc2_cbc() -> *const EVP_CIPHER;

    #[cfg(not(osslconf = "OPENSSL_NO_RC2"))]

    pub fn EVP_rc2_40_cbc() -> *const EVP_CIPHER;



    #[cfg(not(ossl110))]

    pub fn OPENSSL_add_all_algorithms_noconf();

openssl/build.rs

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
use std::env;



fn main() {

    println!("cargo:rustc-check-cfg=cfg(osslconf, values(\"OPENSSL_NO_OCB\", \"OPENSSL_NO_SM4\", \"OPENSSL_NO_SEED\", \"OPENSSL_NO_CHACHA\", \"OPENSSL_NO_CAST\", \"OPENSSL_NO_IDEA\", \"OPENSSL_NO_CAMELLIA\", \"OPENSSL_NO_RC4\", \"OPENSSL_NO_BF\", \"OPENSSL_NO_PSK\", \"OPENSSL_NO_DEPRECATED_3_0\", \"OPENSSL_NO_SCRYPT\", \"OPENSSL_NO_SM3\", \"OPENSSL_NO_RMD160\", \"OPENSSL_NO_EC2M\", \"OPENSSL_NO_OCSP\", \"OPENSSL_NO_CMS\", \"OPENSSL_NO_EC\", \"OPENSSL_NO_ARGON2\"))");

    println!("cargo:rustc-check-cfg=cfg(osslconf, values(\"OPENSSL_NO_OCB\", \"OPENSSL_NO_SM4\", \"OPENSSL_NO_SEED\", \"OPENSSL_NO_CHACHA\", \"OPENSSL_NO_CAST\", \"OPENSSL_NO_IDEA\", \"OPENSSL_NO_CAMELLIA\", \"OPENSSL_NO_RC4\", \"OPENSSL_NO_BF\", \"OPENSSL_NO_PSK\", \"OPENSSL_NO_DEPRECATED_3_0\", \"OPENSSL_NO_SCRYPT\", \"OPENSSL_NO_SM3\", \"OPENSSL_NO_RMD160\", \"OPENSSL_NO_EC2M\", \"OPENSSL_NO_OCSP\", \"OPENSSL_NO_CMS\", \"OPENSSL_NO_EC\", \"OPENSSL_NO_ARGON2\", \"OPENSSL_NO_RC2\"))");



    println!("cargo:rustc-check-cfg=cfg(libressl)");

    println!("cargo:rustc-check-cfg=cfg(boringssl)");

openssl/src/symm.rs

+10 −0
Original line number Diff line number Diff line
@@ -454,6 +454,16 @@ impl Cipher { 
        unsafe { Cipher(ffi::EVP_sm4_ofb()) }

    }



    #[cfg(not(osslconf = "OPENSSL_NO_RC2"))]

    pub fn rc2_cbc() -> Cipher {

        unsafe { Cipher(ffi::EVP_rc2_cbc()) }

    }



    #[cfg(not(osslconf = "OPENSSL_NO_RC2"))]

    pub fn rc2_40_cbc() -> Cipher {

        unsafe { Cipher(ffi::EVP_rc2_40_cbc()) }

    }



    /// Creates a `Cipher` from a raw pointer to its OpenSSL type.

    ///

    /// # Safety