Unverified Commit 7f4ceb51 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1060 from okuryu/des-ede3-cfb 

Add des_ede3_cfb64 symm cipher
parents 3a170b65 899fc30e

openssl-sys/src/evp.rs

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

    pub fn EVP_des_ede3() -> *const EVP_CIPHER;

    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;

    pub fn EVP_rc4() -> *const EVP_CIPHER;

    pub fn EVP_bf_ecb() -> *const EVP_CIPHER;

openssl/src/symm.rs

+14 −0
Original line number Diff line number Diff line
@@ -194,6 +194,10 @@ impl Cipher { 
        unsafe { Cipher(ffi::EVP_des_ede3_cbc()) }

    }



    pub fn des_ede3_cfb64() -> Cipher {

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

    }



    pub fn rc4() -> Cipher {

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

    }
@@ -1055,6 +1059,16 @@ mod tests { 
        cipher_test(super::Cipher::des_ede3_cbc(), pt, ct, key, iv);

    }



    #[test]

    fn test_des_ede3_cfb64() {

        let pt = "2b1773784b5889dc788477367daa98ad";

        let ct = "6f2867cfefda048a4046ef7e556c7132";

        let key = "7cb66337f3d3c0fe7cb66337f3d3c0fe7cb66337f3d3c0fe";

        let iv = "0001020304050607";



        cipher_test(super::Cipher::des_ede3_cfb64(), pt, ct, key, iv);

    }



    #[test]

    fn test_aes128_gcm() {

        let key = "0e00c76561d2bd9b40c3c15427e2b08f";