Commit a5a3f557 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #492 from sfackler/gcm 

Support AES GCM
parents 44010d7f bea53bb3

openssl-sys/src/lib.rs

+2 −2
Original line number Diff line number Diff line
@@ -1359,7 +1359,7 @@ extern { 
    pub fn EVP_aes_128_ecb() -> *const EVP_CIPHER;

    pub fn EVP_aes_128_xts() -> *const EVP_CIPHER;

    pub fn EVP_aes_128_ctr() -> *const EVP_CIPHER;

    // fn EVP_aes_128_gcm() -> EVP_CIPHER;

    pub fn EVP_aes_128_gcm() -> *const EVP_CIPHER;

    pub fn EVP_aes_128_cfb1() -> *const EVP_CIPHER;

    pub fn EVP_aes_128_cfb128() -> *const EVP_CIPHER;

    pub fn EVP_aes_128_cfb8() -> *const EVP_CIPHER;
@@ -1367,7 +1367,7 @@ extern { 
    pub fn EVP_aes_256_ecb() -> *const EVP_CIPHER;

    pub fn EVP_aes_256_xts() -> *const EVP_CIPHER;

    pub fn EVP_aes_256_ctr() -> *const EVP_CIPHER;

    // fn EVP_aes_256_gcm() -> EVP_CIPHER;

    pub fn EVP_aes_256_gcm() -> *const EVP_CIPHER;

    pub fn EVP_aes_256_cfb1() -> *const EVP_CIPHER;

    pub fn EVP_aes_256_cfb128() -> *const EVP_CIPHER;

    pub fn EVP_aes_256_cfb8() -> *const EVP_CIPHER;

openssl/src/symm.rs

+16 −0
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ impl Cipher { 
        }

    }



    pub fn aes_128_gcm() -> Cipher {

        unsafe {

            Cipher(ffi::EVP_aes_128_gcm())

        }

    }



    pub fn aes_256_ecb() -> Cipher {

        unsafe {

            Cipher(ffi::EVP_aes_256_ecb())
@@ -100,6 +106,12 @@ impl Cipher { 
        }

    }



    pub fn aes_256_gcm() -> Cipher {

        unsafe {

            Cipher(ffi::EVP_aes_256_gcm())

        }

    }



    pub fn des_cbc() -> Cipher {

        unsafe {

            Cipher(ffi::EVP_des_cbc())
@@ -118,6 +130,10 @@ impl Cipher { 
        }

    }



    pub unsafe fn from_ptr(ptr: *const ffi::EVP_CIPHER) -> Cipher {

        Cipher(ptr)

    }



    pub fn as_ptr(&self) -> *const ffi::EVP_CIPHER {

        self.0

    }