Unverified Commit 99ea8a8a authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #2011 from alex/chacha20poly1305-libressl 

Expose chacha20_poly1305 on LibreSSL
parents 7daab5b9 ca438e2b

openssl-sys/src/handwritten/evp.rs

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ extern "C" { 
    pub fn EVP_aes_256_wrap_pad() -> *const EVP_CIPHER;

    #[cfg(all(ossl110, not(osslconf = "OPENSSL_NO_CHACHA")))]

    pub fn EVP_chacha20() -> *const EVP_CIPHER;

    #[cfg(all(ossl110, not(osslconf = "OPENSSL_NO_CHACHA")))]

    #[cfg(all(any(ossl110, libressl360), not(osslconf = "OPENSSL_NO_CHACHA")))]

    pub fn EVP_chacha20_poly1305() -> *const EVP_CIPHER;

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

    pub fn EVP_seed_cbc() -> *const EVP_CIPHER;

openssl/src/cipher.rs

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ impl Cipher { 
        unsafe { CipherRef::from_ptr(ffi::EVP_chacha20() as *mut _) }

    }



    #[cfg(all(ossl110, not(osslconf = "OPENSSL_NO_CHACHA")))]

    #[cfg(all(any(ossl110, libressl360), not(osslconf = "OPENSSL_NO_CHACHA")))]

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

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

    }

openssl/src/symm.rs

+2 −2
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ impl Cipher { 
    }



    /// Requires OpenSSL 1.1.0 or newer.

    #[cfg(all(ossl110, not(osslconf = "OPENSSL_NO_CHACHA")))]

    #[cfg(all(any(ossl110, libressl360), not(osslconf = "OPENSSL_NO_CHACHA")))]

    pub fn chacha20_poly1305() -> Cipher {

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

    }
@@ -1493,7 +1493,7 @@ mod tests { 
    }



    #[test]

    #[cfg(ossl110)]

    #[cfg(any(ossl110, libressl360))]

    fn test_chacha20_poly1305() {

        let key = "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f";

        let iv = "070000004041424344454647";