Unverified Commit 09f672f9 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1786 from wiktor-k/add-cast-check 

Add check for OPENSSL_NO_CAST
parents f0ef5f3a 62c8dfde

openssl-sys/build/expando.c

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ RUST_CONF_OPENSSL_NO_IDEA 
RUST_CONF_OPENSSL_NO_CAMELLIA

#endif



#ifdef OPENSSL_NO_CAST

RUST_CONF_OPENSSL_NO_CAST

#endif



#ifdef OPENSSL_NO_CMS

RUST_CONF_OPENSSL_NO_CMS

#endif

openssl-sys/src/handwritten/evp.rs

+2 −2
Original line number Diff line number Diff line
@@ -380,9 +380,9 @@ extern "C" { 
    #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAMELLIA")))]

    pub fn EVP_camellia_256_ecb() -> *const EVP_CIPHER;



    #[cfg(not(boringssl))]

    #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAST")))]

    pub fn EVP_cast5_cfb64() -> *const EVP_CIPHER;

    #[cfg(not(boringssl))]

    #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAST")))]

    pub fn EVP_cast5_ecb() -> *const EVP_CIPHER;



    #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_IDEA")))]

openssl/src/cipher.rs

+2 −2
Original line number Diff line number Diff line
@@ -358,12 +358,12 @@ impl Cipher { 
        unsafe { CipherRef::from_ptr(ffi::EVP_camellia_256_ecb() as *mut _) }

    }



    #[cfg(not(boringssl))]

    #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAST")))]

    pub fn cast5_cfb64() -> &'static CipherRef {

        unsafe { CipherRef::from_ptr(ffi::EVP_cast5_cfb64() as *mut _) }

    }



    #[cfg(not(boringssl))]

    #[cfg(not(any(boringssl, osslconf = "OPENSSL_NO_CAST")))]

    pub fn cast5_ecb() -> &'static CipherRef {

        unsafe { CipherRef::from_ptr(ffi::EVP_cast5_ecb() as *mut _) }

    }