X-Git-Url: http://git.euphorik.ch/?p=crypto_lab1.git;a=blobdiff_plain;f=src%2Fcrypto.rs;h=35c7b48bf7bea16e5063c97e04748fcaf09a54c5;hp=39e8696725c5e831158fd0af7d785ff8d660071d;hb=1b43320b00cc7022cc8dc31f62e7d1cf9ebfd183;hpb=911f8410c05d3d16922587a59266096f3c6899e1

diff --git a/src/crypto.rs b/src/crypto.rs
index 39e8696..35c7b48 100644
--- a/src/crypto.rs
+++ b/src/crypto.rs
@@ -16,16 +16,34 @@ pub fn compute_mac(data: &[u8]) -> [u8, ..10] {
    result
 }
 
-pub fn encrypt(plaindata: &[u8], iv: &[u8]) -> Vec<u8> {
-   symm::encrypt(symm::AES_256_CBC, KEY_C, iv.to_vec(), plaindata)
+pub fn encrypt(plaindata: &[u8], iv: &[u8]) -> Option<Vec<u8>> {
+   let c = symm::Crypter::new(symm::AES_256_CBC);
+   c.init(symm::Encrypt, KEY_C, iv.to_vec());
+   c.pad(false); // Padding disabled!
+   let mut r = c.update(plaindata);
+   let rest = c.finalize();
+   if rest.is_empty() {
+      Some(r)
+   } else {
+      None
+   }
 }
 
-pub fn decrypt(cypherdata: &[u8], iv: &[u8]) -> Vec<u8> {
-   symm::decrypt(symm::AES_256_CBC, KEY_C, iv.to_vec(), cypherdata)
+pub fn decrypt(cypherdata: &[u8], iv: &[u8]) -> Option<Vec<u8>> {
+   let c = symm::Crypter::new(symm::AES_256_CBC);
+   c.init(symm::Decrypt, KEY_C, iv.to_vec());
+   c.pad(false); // Padding disabled!
+   let mut r = c.update(cypherdata);
+   let rest = c.finalize();
+   if rest.is_empty() {
+      Some(r)
+   } else {
+      None
+   }
 }
 
 pub fn generate_key(size_byte: uint) -> IoResult<Vec<u8>>  {
-   let mut bytes = Vec::      from_elem(size_byte, 0u8);
+   let mut bytes = Vec::from_elem(size_byte, 0u8);
    let mut generator = try!(OsRng::new()); // Uses '/dev/urandom' on Unix-like systems.
    generator.fill_bytes(bytes.as_mut_slice_());
    Ok(bytes)