Skip to content

Update symm for ~[T] changes #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 13, 2014
Merged

Update symm for ~[T] changes #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b0220d
Update symm for ~[T] changes
zzmp Jun 12, 2014
4bb4c46
Update symm test for ~[T] changes
zzmp Jun 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions crypto/symm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ impl Crypter {
/**
* Initializes this crypter.
*/
pub fn init(&self, mode: Mode, key: &[u8], iv: &[u8]) {
pub fn init(&self, mode: Mode, key: &[u8], iv: Vec<u8>) {
unsafe {
let mode = match mode {
Encrypt => 1 as c_int,
Expand Down Expand Up @@ -171,7 +171,7 @@ impl Drop for Crypter {
* Encrypts data, using the specified crypter type in encrypt mode with the
* specified key and iv; returns the resulting (encrypted) data.
*/
pub fn encrypt(t: Type, key: &[u8], iv: ~[u8], data: &[u8]) -> Vec<u8> {
pub fn encrypt(t: Type, key: &[u8], iv: Vec<u8>, data: &[u8]) -> Vec<u8> {
let c = Crypter::new(t);
c.init(Encrypt, key, iv);
let r = c.update(data);
Expand All @@ -183,7 +183,7 @@ pub fn encrypt(t: Type, key: &[u8], iv: ~[u8], data: &[u8]) -> Vec<u8> {
* Decrypts data, using the specified crypter type in decrypt mode with the
* specified key and iv; returns the resulting (decrypted) data.
*/
pub fn decrypt(t: Type, key: &[u8], iv: ~[u8], data: &[u8]) -> Vec<u8> {
pub fn decrypt(t: Type, key: &[u8], iv: Vec<u8>, data: &[u8]) -> Vec<u8> {
let c = Crypter::new(t);
c.init(Decrypt, key, iv);
let r = c.update(data);
Expand Down Expand Up @@ -211,11 +211,11 @@ mod tests {
vec!(0x8eu8, 0xa2u8, 0xb7u8, 0xcau8, 0x51u8, 0x67u8, 0x45u8, 0xbfu8,
0xeau8, 0xfcu8, 0x49u8, 0x90u8, 0x4bu8, 0x49u8, 0x60u8, 0x89u8);
let c = super::Crypter::new(super::AES_256_ECB);
c.init(super::Encrypt, k0.as_slice(), []);
c.init(super::Encrypt, k0.as_slice(), vec![]);
c.pad(false);
let r0 = c.update(p0.as_slice()).append(c.final().as_slice());
assert!(r0 == c0);
c.init(super::Decrypt, k0.as_slice(), []);
c.init(super::Decrypt, k0.as_slice(), vec![]);
c.pad(false);
let p1 = c.update(r0.as_slice()).append(c.final().as_slice());
assert!(p1 == p0);
Expand All @@ -225,7 +225,7 @@ mod tests {
use serialize::hex::ToHex;

let cipher = super::Crypter::new(ciphertype);
cipher.init(super::Encrypt, key.from_hex().unwrap().as_slice(), iv.from_hex().unwrap().as_slice());
cipher.init(super::Encrypt, key.from_hex().unwrap().as_slice(), iv.from_hex().unwrap());

let expected = Vec::from_slice(ct.from_hex().unwrap().as_slice());
let computed = cipher.update(pt.from_hex().unwrap().as_slice()).append(cipher.final().as_slice());
Expand Down