1 files changed, 87 insertions, 5 deletions

diff --git a/symm.rs b/symm.rs
index c4ed97e9..bc28624a 100644
--- a/symm.rs
+++ b/symm.rs
@@ -8,7 +8,7 @@ pub type EVP_CIPHER_CTX = *libc::c_void;
 #[allow(non_camel_case_types)]
 pub type EVP_CIPHER = *libc::c_void;
 
-pub mod libcrypto {
+mod libcrypto {
     use super::*;
     use std::libc::{c_int, c_uint};
 
@@ -20,10 +20,15 @@ pub mod libcrypto {
 
         fn EVP_aes_128_ecb() -> EVP_CIPHER;
         fn EVP_aes_128_cbc() -> EVP_CIPHER;
-        fn EVP_aes_192_ecb() -> EVP_CIPHER;
-        fn EVP_aes_192_cbc() -> EVP_CIPHER;
+        // fn EVP_aes_128_ctr() -> EVP_CIPHER;
+        // fn EVP_aes_128_gcm() -> EVP_CIPHER;
+
         fn EVP_aes_256_ecb() -> EVP_CIPHER;
         fn EVP_aes_256_cbc() -> EVP_CIPHER;
+        // fn EVP_aes_256_ctr() -> EVP_CIPHER;
+        // fn EVP_aes_256_gcm() -> EVP_CIPHER;
+
+        fn EVP_rc4() -> EVP_CIPHER;
 
         fn EVP_CipherInit(ctx: EVP_CIPHER_CTX, evp: EVP_CIPHER,
                           key: *u8, iv: *u8, mode: c_int);
@@ -40,15 +45,33 @@ pub enum Mode {
 
 #[allow(non_camel_case_types)]
 pub enum Type {
+    AES_128_ECB,
+    AES_128_CBC,
+    // AES_128_CTR,
+    //AES_128_GCM,
+
     AES_256_ECB,
     AES_256_CBC,
+    // AES_256_CTR,
+    //AES_256_GCM,
+
+    RC4_128,
 }
 
 fn evpc(t: Type) -> (EVP_CIPHER, uint, uint) {
     unsafe {
         match t {
+            AES_128_ECB => (libcrypto::EVP_aes_128_ecb(), 16u, 16u),
+            AES_128_CBC => (libcrypto::EVP_aes_128_cbc(), 16u, 16u),
+            // AES_128_CTR => (libcrypto::EVP_aes_128_ctr(), 16u, 0u),
+            //AES_128_GCM => (libcrypto::EVP_aes_128_gcm(), 16u, 16u),
+
             AES_256_ECB => (libcrypto::EVP_aes_256_ecb(), 32u, 16u),
             AES_256_CBC => (libcrypto::EVP_aes_256_cbc(), 32u, 16u),
+            // AES_256_CTR => (libcrypto::EVP_aes_256_ctr(), 32u, 0u),
+            //AES_256_GCM => (libcrypto::EVP_aes_256_gcm(), 32u, 16u),
+
+            RC4_128 => (libcrypto::EVP_rc4(), 16u, 0u),
         }
     }
 }
@@ -73,8 +96,12 @@ impl Crypter {
      * data encrypted must be a multiple of block size.
      */
     pub fn pad(&self, padding: bool) {
-        let v = if padding { 1 } else { 0} as c_int;
-        unsafe { libcrypto::EVP_CIPHER_CTX_set_padding(self.ctx, v) };
+        if self.blocksize > 0 {
+            unsafe {
+                let v = if padding { 1 } else { 0 } as c_int;
+                libcrypto::EVP_CIPHER_CTX_set_padding(self.ctx, v);
+            }
+        }
     }
 
     /**
@@ -186,6 +213,8 @@ pub fn decrypt(t: Type, key: &[u8], iv: ~[u8], data: &[u8]) -> ~[u8] {
 mod tests {
     use super::*;
 
+    use hex::FromHex;
+
     // Test vectors from FIPS-197:
     // http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
     #[test]
@@ -211,4 +240,57 @@ mod tests {
         let p1 = c.update(r0) + c.final();
         assert!(p1 == p0);
     }
+
+    fn cipher_test(ciphertype: Type, pt: ~str, ct: ~str, key: ~str, iv: ~str) {
+        use hex::ToHex;
+
+        let cipher = Crypter::new(ciphertype);
+        cipher.init(Encrypt, key.from_hex(), iv.from_hex());
+
+        let expected = ct.from_hex();
+        let computed = cipher.update(pt.from_hex()) + cipher.final();
+
+        if computed != expected {
+            println(fmt!("Computed: %s", computed.to_hex()));
+            println(fmt!("Expected: %s", expected.to_hex()));
+            if computed.len() != expected.len() {
+                println(fmt!("Lengths differ: %u in computed vs %u expected",
+                             computed.len(), expected.len()));
+            }
+            fail!(~"test failure");
+        }
+    }
+
+    #[test]
+    fn test_rc4() {
+
+        let pt = ~"0000000000000000000000000000000000000000000000000000000000000000000000000000";
+        let ct = ~"A68686B04D686AA107BD8D4CAB191A3EEC0A6294BC78B60F65C25CB47BD7BB3A48EFC4D26BE4";
+        let key = ~"97CD440324DA5FD1F7955C1C13B6B466";
+        let iv = ~"";
+
+        cipher_test(RC4_128, pt, ct, key, iv);
+    }
+
+    /*#[test]
+    fn test_aes128_ctr() {
+
+        let pt = ~"6BC1BEE22E409F96E93D7E117393172AAE2D8A571E03AC9C9EB76FAC45AF8E5130C81C46A35CE411E5FBC1191A0A52EFF69F2445DF4F9B17AD2B417BE66C3710";
+        let ct = ~"874D6191B620E3261BEF6864990DB6CE9806F66B7970FDFF8617187BB9FFFDFF5AE4DF3EDBD5D35E5B4F09020DB03EAB1E031DDA2FBE03D1792170A0F3009CEE";
+        let key = ~"2B7E151628AED2A6ABF7158809CF4F3C";
+        let iv = ~"F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF";
+
+        cipher_test(AES_128_CTR, pt, ct, key, iv);
+    }*/
+
+    /*#[test]
+    fn test_aes128_gcm() {
+        // Test case 3 in GCM spec
+        let pt = ~"d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255";
+        let ct = ~"42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f59854d5c2af327cd64a62cf35abd2ba6fab4";
+        let key = ~"feffe9928665731c6d6a8f9467308308";
+        let iv = ~"cafebabefacedbaddecaf888";
+
+        cipher_test(AES_128_GCM, pt, ct, key, iv);
+    }*/
 }