diff options
author | Jesse Luehrs <doy@tozt.net> | 2015-04-05 23:23:31 -0400 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2015-04-05 23:23:31 -0400 |
commit | f955edd17464fb35df86e07bb2c3076b7e1274d8 (patch) | |
tree | 28511061722fc4ac42ce5e9ca5fdadae3d5e7af0 /src/aes.rs | |
parent | db35b25063a2fbf5e471ac1c30fb16826023c8a3 (diff) | |
download | matasano-f955edd17464fb35df86e07bb2c3076b7e1274d8.tar.gz matasano-f955edd17464fb35df86e07bb2c3076b7e1274d8.zip |
remove a bunch of unnecessary imports
Diffstat (limited to 'src/aes.rs')
-rw-r--r-- | src/aes.rs | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -1,13 +1,10 @@ -use openssl; -use std; - use primitives::{fixed_xor, pad_pkcs7, unpad_pkcs7}; pub fn decrypt_aes_128_ecb (bytes: &[u8], key: &[u8]) -> Option<Vec<u8>> { // openssl already doesn't return differentiable results for invalid // padding, so we can't either - return Some(openssl::crypto::symm::decrypt( - openssl::crypto::symm::Type::AES_128_ECB, + return Some(::openssl::crypto::symm::decrypt( + ::openssl::crypto::symm::Type::AES_128_ECB, key, vec![], bytes @@ -31,8 +28,8 @@ pub fn decrypt_aes_128_cbc (bytes: &[u8], key: &[u8], iv: &[u8]) -> Option<Vec<u } pub fn encrypt_aes_128_ecb (bytes: &[u8], key: &[u8]) -> Vec<u8> { - return openssl::crypto::symm::encrypt( - openssl::crypto::symm::Type::AES_128_ECB, + return ::openssl::crypto::symm::encrypt( + ::openssl::crypto::symm::Type::AES_128_ECB, key, vec![], bytes @@ -56,13 +53,13 @@ pub fn encrypt_aes_128_cbc (bytes: &[u8], key: &[u8], iv: &[u8]) -> Vec<u8> { pub fn aes_128_ctr (bytes: &[u8], key: &[u8], nonce: u64) -> Vec<u8> { let nonce_array: [u8; 8] = unsafe { - std::mem::transmute(nonce.to_le()) + ::std::mem::transmute(nonce.to_le()) }; let mut counter = 0u64; let mut ret = vec![]; for block in bytes.chunks(16) { let counter_array: [u8; 8] = unsafe { - std::mem::transmute(counter.to_le()) + ::std::mem::transmute(counter.to_le()) }; let keystream = encrypt_aes_128_ecb( &pad_pkcs7( |