Update some enum scope issues regarding the OpenSSL lib.

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

diff --git a/lab1_rust/src/crypto.rs b/lab1_rust/src/crypto.rs
index cc217a6..ad7e6fa 100644 (file)
--- a/lab1_rust/src/crypto.rs
+++ b/lab1_rust/src/crypto.rs
@@ -1,7 +1,7 @@
 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;
 
@@ -20,8 +20,8 @@ pub fn compute_mac(data: &[u8]) -> [u8, ..10] {
 
 /// 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();
@@ -34,8 +34,8 @@ pub fn encrypt(plaindata: &[u8], iv: &[u8]) -> Option<Vec<u8>> {
 
 /// 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::AES_256_CBC);
-   c.init(symm::Decrypt, KEY_C, iv.to_vec());
+   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(cipherdata);
    let rest = c.finalize();