From acbcb49414e5b5697b601cc09f5e0f78179fbf06 Mon Sep 17 00:00:00 2001
From: Will Tange <will@brt.sexy>
Date: Fri, 9 Oct 2015 17:35:20 +0200
Subject: [PATCH] AES CFB{1,8,128} mode support

---
 openssl-sys/src/lib.rs              |  6 +++
 openssl/src/crypto/symm.rs          | 73 +++++++++++++++++++++++++++++
 openssl/src/crypto/symm_internal.rs |  8 +++-
 3 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 3bc9e59a8..b07d243b5 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -417,6 +417,9 @@ extern "C" {
     #[cfg(feature = "aes_ctr")]
     pub fn EVP_aes_128_ctr() -> *const EVP_CIPHER;
     // fn EVP_aes_128_gcm() -> 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;
     pub fn EVP_aes_256_cbc() -> *const EVP_CIPHER;
     pub fn EVP_aes_256_ecb() -> *const EVP_CIPHER;
     #[cfg(feature = "aes_xts")]
@@ -424,6 +427,9 @@ extern "C" {
     #[cfg(feature = "aes_ctr")]
     pub fn EVP_aes_256_ctr() -> *const EVP_CIPHER;
     // fn EVP_aes_256_gcm() -> 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;
     pub fn EVP_rc4() -> *const EVP_CIPHER;
 
     pub fn EVP_BytesToKey(typ: *const EVP_CIPHER, md: *const EVP_MD,
diff --git a/openssl/src/crypto/symm.rs b/openssl/src/crypto/symm.rs
index 226b2cbfb..db8aa54ee 100644
--- a/openssl/src/crypto/symm.rs
+++ b/openssl/src/crypto/symm.rs
@@ -22,6 +22,9 @@ pub enum Type {
     #[cfg(feature = "aes_ctr")]
     AES_128_CTR,
     //AES_128_GCM,
+    AES_128_CFB1,
+    AES_128_CFB128,
+    AES_128_CFB8,
 
     AES_256_ECB,
     AES_256_CBC,
@@ -31,6 +34,9 @@ pub enum Type {
     #[cfg(feature = "aes_ctr")]
     AES_256_CTR,
     //AES_256_GCM,
+    AES_256_CFB1,
+    AES_256_CFB128,
+    AES_256_CFB8,
 
     RC4_128,
 }
@@ -292,4 +298,71 @@ mod tests {
 
         cipher_test(super::AES_128_GCM, pt, ct, key, iv);
     }*/
+
+    #[test]
+    fn test_aes128_cfb1() {
+        // Lifted from http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
+
+        let pt = "6bc1";
+        let ct = "68b3";
+        let key = "2b7e151628aed2a6abf7158809cf4f3c";
+        let iv = "000102030405060708090a0b0c0d0e0f";
+
+        cipher_test(super::Type::AES_128_CFB1, pt, ct, key, iv);
+    }
+
+    #[test]
+    fn test_aes128_cfb128() {
+
+        let pt = "6bc1bee22e409f96e93d7e117393172a";
+        let ct = "3b3fd92eb72dad20333449f8e83cfb4a";
+        let key = "2b7e151628aed2a6abf7158809cf4f3c";
+        let iv = "000102030405060708090a0b0c0d0e0f";
+
+        cipher_test(super::Type::AES_128_CFB128, pt, ct, key, iv);
+    }
+
+    #[test]
+    fn test_aes128_cfb8() {
+
+        let pt = "6bc1bee22e409f96e93d7e117393172aae2d";
+        let ct = "3b79424c9c0dd436bace9e0ed4586a4f32b9";
+        let key = "2b7e151628aed2a6abf7158809cf4f3c";
+        let iv = "000102030405060708090a0b0c0d0e0f";
+
+        cipher_test(super::Type::AES_128_CFB8, pt, ct, key, iv);
+    }
+
+    #[test]
+    fn test_aes256_cfb1() {
+
+        let pt = "6bc1";
+        let ct = "9029";
+        let key = "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4";
+        let iv = "000102030405060708090a0b0c0d0e0f";
+
+        cipher_test(super::Type::AES_256_CFB1, pt, ct, key, iv);
+    }
+
+    #[test]
+    fn test_aes256_cfb128() {
+
+        let pt = "6bc1bee22e409f96e93d7e117393172a";
+        let ct = "dc7e84bfda79164b7ecd8486985d3860";
+        let key = "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4";
+        let iv = "000102030405060708090a0b0c0d0e0f";
+
+        cipher_test(super::Type::AES_256_CFB128, pt, ct, key, iv);
+    }
+
+    #[test]
+    fn test_aes256_cfb8() {
+
+        let pt = "6bc1bee22e409f96e93d7e117393172aae2d";
+        let ct = "dc1f1a8520a64db55fcc8ac554844e889700";
+        let key = "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4";
+        let iv = "000102030405060708090a0b0c0d0e0f";
+
+        cipher_test(super::Type::AES_256_CFB8, pt, ct, key, iv);
+    }
 }
diff --git a/openssl/src/crypto/symm_internal.rs b/openssl/src/crypto/symm_internal.rs
index c42efb79d..fcb3ee71d 100644
--- a/openssl/src/crypto/symm_internal.rs
+++ b/openssl/src/crypto/symm_internal.rs
@@ -11,6 +11,9 @@ pub fn evpc(t: symm::Type) -> (*const ffi::EVP_CIPHER, u32, u32) {
             #[cfg(feature = "aes_ctr")]
             symm::Type::AES_128_CTR => (ffi::EVP_aes_128_ctr(), 16, 0),
             //AES_128_GCM => (EVP_aes_128_gcm(), 16, 16),
+            symm::Type::AES_128_CFB1 => (ffi::EVP_aes_128_cfb1(), 16, 16),
+            symm::Type::AES_128_CFB128 => (ffi::EVP_aes_128_cfb128(), 16, 16),
+            symm::Type::AES_128_CFB8 => (ffi::EVP_aes_128_cfb8(), 16, 16),
 
             symm::Type::AES_256_ECB => (ffi::EVP_aes_256_ecb(), 32, 16),
             symm::Type::AES_256_CBC => (ffi::EVP_aes_256_cbc(), 32, 16),
@@ -19,8 +22,11 @@ pub fn evpc(t: symm::Type) -> (*const ffi::EVP_CIPHER, u32, u32) {
             #[cfg(feature = "aes_ctr")]
             symm::Type::AES_256_CTR => (ffi::EVP_aes_256_ctr(), 32, 0),
             //AES_256_GCM => (EVP_aes_256_gcm(), 32, 16),
+            symm::Type::AES_256_CFB1 => (ffi::EVP_aes_256_cfb1(), 32, 16),
+            symm::Type::AES_256_CFB128 => (ffi::EVP_aes_256_cfb128(), 32, 16),
+            symm::Type::AES_256_CFB8 => (ffi::EVP_aes_256_cfb8(), 32, 16),
 
             symm::Type::RC4_128 => (ffi::EVP_rc4(), 16, 0),
         }
     }
-}
\ No newline at end of file
+}
-- 
GitLab