Changes according the latest Rust nightly.

[crypto_lab1.git] / lab1_rust / src / crypto.rs

diff --git a/lab1_rust/src/crypto.rs b/lab1_rust/src/crypto.rs
index d9fe182..67d0b38 100644 (file)
--- a/lab1_rust/src/crypto.rs
+++ b/lab1_rust/src/crypto.rs
@@ -1,27 +1,28 @@
 use std::rand::{ OsRng, Rng };
 use std::io::IoResult;
 use std::slice::bytes::copy_memory;
-use openssl::crypto::hash::SHA256;
+use openssl::crypto::hash::HashType::SHA256;
 use openssl::crypto::hmac::HMAC;
 use openssl::crypto::symm;
+use utils::from_elem;
 
 // These aren't the keys you're looking for.
-static KEY_A: &'static [u8] = [125, 31, 131, 118, 143, 180, 252, 53, 211, 217, 79, 240, 128, 91, 252, 87, 104, 236, 145, 198, 163, 203, 161, 12, 53, 56, 218, 40, 221, 95, 171, 140];
-static KEY_C: &'static [u8] = [75, 226, 88, 31, 223, 216, 182, 216, 178, 58, 59, 193, 245, 80, 254, 128, 125, 246, 246, 224, 194, 190, 123, 123, 10, 131, 217, 183, 112, 157, 166, 102];
+const KEY_A: &'static [u8] = &[125, 31, 131, 118, 143, 180, 252, 53, 211, 217, 79, 240, 128, 91, 252, 87, 104, 236, 145, 198, 163, 203, 161, 12, 53, 56, 218, 40, 221, 95, 171, 140];
+const KEY_C: &'static [u8] = &[75, 226, 88, 31, 223, 216, 182, 216, 178, 58, 59, 193, 245, 80, 254, 128, 125, 246, 246, 224, 194, 190, 123, 123, 10, 131, 217, 183, 112, 157, 166, 102];
 
-/// Only returns the first ten bytes.
-pub fn compute_mac(data: &[u8]) -> [u8, ..10] {
+/// Only returns the first ten bytes from HMAC-SHA256.
+pub fn compute_mac(data: &[u8]) -> [u8; 10] {
    let mut hmac = HMAC(SHA256, KEY_A);
    hmac.update(data);
-   let mut result = [0u8, ..10];
+   let mut result = [0u8; 10];
    copy_memory(&mut result, hmac.finalize().slice(0, 10));
    result
 }
 
-/// Encrypt may fail if the provided data size isn't a multiple of 16.
+/// Encrypt may fail if the provided data size isn't a multiple of 16, no padding will be automatically added.
 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());
+   let c = symm::Crypter::new(symm::Type::AES_256_CBC);
+   c.init(symm::Mode::Encrypt, KEY_C, iv.to_vec());
    c.pad(false); // Padding disabled!
    let r = c.update(plaindata);
    let rest = c.finalize();
@@ -32,12 +33,12 @@ pub fn encrypt(plaindata: &[u8], iv: &[u8]) -> Option<Vec<u8>> {
    }
 }
 
-/// Decrypt may fail if the provided data size isn't a multiple of 16.
-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());
+/// Decrypt may fail if the provided data size isn't a multiple of 16, no padding will be automatically added.
+pub fn decrypt(cipherdata: &[u8], iv: &[u8]) -> Option<Vec<u8>> {
+   let c = symm::Crypter::new(symm::Type::AES_256_CBC);
+   c.init(symm::Mode::Decrypt, KEY_C, iv.to_vec());
    c.pad(false); // Padding disabled!
-   let r = c.update(cypherdata);
+   let r = c.update(cipherdata);
    let rest = c.finalize();
    if rest.is_empty() {
       Some(r)
@@ -47,8 +48,8 @@ pub fn decrypt(cypherdata: &[u8], iv: &[u8]) -> Option<Vec<u8>> {
 }
 
 pub fn generate_key(size_byte: uint) -> IoResult<Vec<u8>>  {
-   let mut bytes = Vec::from_elem(size_byte, 0u8);
+   let mut bytes = 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_());
+   generator.fill_bytes(bytes.as_mut_slice());
    Ok(bytes)
 }
\ No newline at end of file