Commit 02dc3eda authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge pull request #242 from awelkie/master 

Added AES CTR-mode under feature flag.
parents 322c7845 b478c291

openssl-sys/Cargo.toml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ dtlsv1 = [] 
dtlsv1_2 = []

sslv2 = []

aes_xts = []

aes_ctr = []

npn = []

alpn = []

openssl-sys/src/lib.rs

+4 −2
Original line number Diff line number Diff line
@@ -397,13 +397,15 @@ extern "C" { 
    pub fn EVP_aes_128_ecb() -> *const EVP_CIPHER;

    #[cfg(feature = "aes_xts")]

    pub fn EVP_aes_128_xts() -> *const EVP_CIPHER;

    // fn EVP_aes_128_ctr() -> EVP_CIPHER;

    #[cfg(feature = "aes_ctr")]

    pub fn EVP_aes_128_ctr() -> *const EVP_CIPHER;

    // fn EVP_aes_128_gcm() -> EVP_CIPHER;

    pub fn EVP_aes_256_cbc() -> *const EVP_CIPHER;

    pub fn EVP_aes_256_ecb() -> *const EVP_CIPHER;

    #[cfg(feature = "aes_xts")]

    pub fn EVP_aes_256_xts() -> *const EVP_CIPHER;

    // fn EVP_aes_256_ctr() -> EVP_CIPHER;

    #[cfg(feature = "aes_ctr")]

    pub fn EVP_aes_256_ctr() -> *const EVP_CIPHER;

    // fn EVP_aes_256_gcm() -> EVP_CIPHER;

    pub fn EVP_rc4() -> *const EVP_CIPHER;

openssl/Cargo.toml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ dtlsv1 = ["openssl-sys/dtlsv1"] 
dtlsv1_2 = ["openssl-sys/dtlsv1_2"]

sslv2 = ["openssl-sys/sslv2"]

aes_xts = ["openssl-sys/aes_xts"]

aes_ctr = ["openssl-sys/aes_ctr"]

npn = ["openssl-sys/npn"]

alpn = ["openssl-sys/alpn"]

openssl/src/crypto/symm.rs

+16 −11
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ pub enum Type { 
    /// Requires the `aes_xts` feature

    #[cfg(feature = "aes_xts")]

    AES_128_XTS,

    // AES_128_CTR,

    #[cfg(feature = "aes_ctr")]

    AES_128_CTR,

    //AES_128_GCM,



    AES_256_ECB,
@@ -26,7 +27,8 @@ pub enum Type { 
    /// Requires the `aes_xts` feature

    #[cfg(feature = "aes_xts")]

    AES_256_XTS,

    // AES_256_CTR,

    #[cfg(feature = "aes_ctr")]

    AES_256_CTR,

    //AES_256_GCM,



    RC4_128,
@@ -39,14 +41,16 @@ fn evpc(t: Type) -> (*const ffi::EVP_CIPHER, u32, u32) { 
            Type::AES_128_CBC => (ffi::EVP_aes_128_cbc(), 16, 16),

            #[cfg(feature = "aes_xts")]

            Type::AES_128_XTS => (ffi::EVP_aes_128_xts(), 32, 16),

            // AES_128_CTR => (EVP_aes_128_ctr(), 16, 0),

            #[cfg(feature = "aes_ctr")]

            Type::AES_128_CTR => (ffi::EVP_aes_128_ctr(), 16, 0),

            //AES_128_GCM => (EVP_aes_128_gcm(), 16, 16),



            Type::AES_256_ECB => (ffi::EVP_aes_256_ecb(), 32, 16),

            Type::AES_256_CBC => (ffi::EVP_aes_256_cbc(), 32, 16),

            #[cfg(feature = "aes_xts")]

            Type::AES_256_XTS => (ffi::EVP_aes_256_xts(), 64, 16),

            // AES_256_CTR => (EVP_aes_256_ctr(), 32, 0),

            #[cfg(feature = "aes_ctr")]

            Type::AES_256_CTR => (ffi::EVP_aes_256_ctr(), 32, 0),

            //AES_256_GCM => (EVP_aes_256_gcm(), 32, 16),



            Type::RC4_128 => (ffi::EVP_rc4(), 16, 0),
@@ -288,16 +292,17 @@ mod tests { 
        cipher_test(super::Type::AES_256_XTS, pt, ct, key, iv);

    }



    /*#[test]

    #[test]

    #[cfg(feature = "aes_ctr")]

    fn test_aes128_ctr() {



        let pt = ~"6BC1BEE22E409F96E93D7E117393172AAE2D8A571E03AC9C9EB76FAC45AF8E5130C81C46A35CE411E5FBC1191A0A52EFF69F2445DF4F9B17AD2B417BE66C3710";

        let ct = ~"874D6191B620E3261BEF6864990DB6CE9806F66B7970FDFF8617187BB9FFFDFF5AE4DF3EDBD5D35E5B4F09020DB03EAB1E031DDA2FBE03D1792170A0F3009CEE";

        let key = ~"2B7E151628AED2A6ABF7158809CF4F3C";

        let iv = ~"F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF";

        let pt = "6BC1BEE22E409F96E93D7E117393172AAE2D8A571E03AC9C9EB76FAC45AF8E5130C81C46A35CE411E5FBC1191A0A52EFF69F2445DF4F9B17AD2B417BE66C3710";

        let ct = "874D6191B620E3261BEF6864990DB6CE9806F66B7970FDFF8617187BB9FFFDFF5AE4DF3EDBD5D35E5B4F09020DB03EAB1E031DDA2FBE03D1792170A0F3009CEE";

        let key = "2B7E151628AED2A6ABF7158809CF4F3C";

        let iv = "F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF";



        cipher_test(super::AES_128_CTR, pt, ct, key, iv);

    }*/

        cipher_test(super::Type::AES_128_CTR, pt, ct, key, iv);

    }



    /*#[test]

    fn test_aes128_gcm() {