Skip to content

Commit

Permalink
Merge pull request #51 from DaGenix/fixups
Browse files Browse the repository at this point in the history 
Replace all uses of growable ~[] with Vec
  • Loading branch information
@DaGenix
DaGenix committed Apr 20, 2014
2 parents fc74f53 + c32b98c commit 4b330cd
Show file tree
Hide file tree
Showing 11 changed files with 151 additions and 154 deletions.
7 changes: 3 additions & 4 deletions src/rust-crypto-util/tool.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ extern crate rust_crypto = "rust-crypto";

use std::io;
use std::os;
use std::slice;

use getopts::{optopt, optflag, getopts, Matches};

Expand Down Expand Up @@ -60,10 +59,10 @@ fn run_scrypt(matches: &Matches) {
let pass = io::stdio::stdin_raw().read_exact(pass_len as uint).unwrap();

let params = scrypt::ScryptParams::new(logn, r, p);
let mut output = slice::from_elem(dklen, 0u8);
scrypt::scrypt(pass.as_slice(), salt.as_slice(), &params, output);
let mut output = Vec::from_elem(dklen, 0u8);
scrypt::scrypt(pass.as_slice(), salt.as_slice(), &params, output.as_mut_slice());

match io::stdout().write(output) {
match io::stdout().write(output.as_slice()) {
Ok(_) => { },
Err(_) => fail!("Error writing result")
}
Expand Down
54 changes: 27 additions & 27 deletions src/rust-crypto/aes.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,35 +175,35 @@ pub fn cbc_encryptor<X: PaddingProcessor + Send>(
match key_size {
KeySize128 => {
let aes_enc = aesni::AesNi128Encryptor::new(key);
let enc = ~CbcEncryptor::new(aes_enc, padding, iv.to_owned());
let enc = ~CbcEncryptor::new(aes_enc, padding, Vec::from_slice(iv));
enc as ~Encryptor
}
KeySize192 => {
let aes_enc = aesni::AesNi192Encryptor::new(key);
let enc = ~CbcEncryptor::new(aes_enc, padding, iv.to_owned());
let enc = ~CbcEncryptor::new(aes_enc, padding, Vec::from_slice(iv));
enc as ~Encryptor
}
KeySize256 => {
let aes_enc = aesni::AesNi256Encryptor::new(key);
let enc = ~CbcEncryptor::new(aes_enc, padding, iv.to_owned());
let enc = ~CbcEncryptor::new(aes_enc, padding, Vec::from_slice(iv));
enc as ~Encryptor
}
}
} else {
match key_size {
KeySize128 => {
let aes_enc = aessafe::AesSafe128Encryptor::new(key);
let enc = ~CbcEncryptor::new(aes_enc, padding, iv.to_owned());
let enc = ~CbcEncryptor::new(aes_enc, padding, Vec::from_slice(iv));
enc as ~Encryptor
}
KeySize192 => {
let aes_enc = aessafe::AesSafe192Encryptor::new(key);
let enc = ~CbcEncryptor::new(aes_enc, padding, iv.to_owned());
let enc = ~CbcEncryptor::new(aes_enc, padding, Vec::from_slice(iv));
enc as ~Encryptor
}
KeySize256 => {
let aes_enc = aessafe::AesSafe256Encryptor::new(key);
let enc = ~CbcEncryptor::new(aes_enc, padding, iv.to_owned());
let enc = ~CbcEncryptor::new(aes_enc, padding, Vec::from_slice(iv));
enc as ~Encryptor
}
}
Expand All @@ -219,17 +219,17 @@ pub fn cbc_encryptor<X: PaddingProcessor + Send>(
match key_size {
KeySize128 => {
let aes_enc = aessafe::AesSafe128Encryptor::new(key);
let enc = ~CbcEncryptor::new(aes_enc, padding, iv.to_owned());
let enc = ~CbcEncryptor::new(aes_enc, padding, Vec::from_slice(iv));
enc as ~Encryptor
}
KeySize192 => {
let aes_enc = aessafe::AesSafe192Encryptor::new(key);
let enc = ~CbcEncryptor::new(aes_enc, padding, iv.to_owned());
let enc = ~CbcEncryptor::new(aes_enc, padding, Vec::from_slice(iv));
enc as ~Encryptor
}
KeySize256 => {
let aes_enc = aessafe::AesSafe256Encryptor::new(key);
let enc = ~CbcEncryptor::new(aes_enc, padding, iv.to_owned());
let enc = ~CbcEncryptor::new(aes_enc, padding, Vec::from_slice(iv));
enc as ~Encryptor
}
}
Expand All @@ -247,35 +247,35 @@ pub fn cbc_decryptor<X: PaddingProcessor + Send>(
match key_size {
KeySize128 => {
let aes_dec = aesni::AesNi128Decryptor::new(key);
let dec = ~CbcDecryptor::new(aes_dec, padding, iv.to_owned());
let dec = ~CbcDecryptor::new(aes_dec, padding, Vec::from_slice(iv));
dec as ~Decryptor
}
KeySize192 => {
let aes_dec = aesni::AesNi192Decryptor::new(key);
let dec = ~CbcDecryptor::new(aes_dec, padding, iv.to_owned());
let dec = ~CbcDecryptor::new(aes_dec, padding, Vec::from_slice(iv));
dec as ~Decryptor
}
KeySize256 => {
let aes_dec = aesni::AesNi256Decryptor::new(key);
let dec = ~CbcDecryptor::new(aes_dec, padding, iv.to_owned());
let dec = ~CbcDecryptor::new(aes_dec, padding, Vec::from_slice(iv));
dec as ~Decryptor
}
}
} else {
match key_size {
KeySize128 => {
let aes_dec = aessafe::AesSafe128Decryptor::new(key);
let dec = ~CbcDecryptor::new(aes_dec, padding, iv.to_owned());
let dec = ~CbcDecryptor::new(aes_dec, padding, Vec::from_slice(iv));
dec as ~Decryptor
}
KeySize192 => {
let aes_dec = aessafe::AesSafe192Decryptor::new(key);
let dec = ~CbcDecryptor::new(aes_dec, padding, iv.to_owned());
let dec = ~CbcDecryptor::new(aes_dec, padding, Vec::from_slice(iv));
dec as ~Decryptor
}
KeySize256 => {
let aes_dec = aessafe::AesSafe256Decryptor::new(key);
let dec = ~CbcDecryptor::new(aes_dec, padding, iv.to_owned());
let dec = ~CbcDecryptor::new(aes_dec, padding, Vec::from_slice(iv));
dec as ~Decryptor
}
}
Expand All @@ -292,17 +292,17 @@ pub fn cbc_decryptor<X: PaddingProcessor + Send>(
match key_size {
KeySize128 => {
let aes_dec = aessafe::AesSafe128Decryptor::new(key);
let dec = ~CbcDecryptor::new(aes_dec, padding, iv.to_owned());
let dec = ~CbcDecryptor::new(aes_dec, padding, Vec::from_slice(iv));
dec as ~Decryptor
}
KeySize192 => {
let aes_dec = aessafe::AesSafe192Decryptor::new(key);
let dec = ~CbcDecryptor::new(aes_dec, padding, iv.to_owned());
let dec = ~CbcDecryptor::new(aes_dec, padding, Vec::from_slice(iv));
dec as ~Decryptor
}
KeySize256 => {
let aes_dec = aessafe::AesSafe256Decryptor::new(key);
let dec = ~CbcDecryptor::new(aes_dec, padding, iv.to_owned());
let dec = ~CbcDecryptor::new(aes_dec, padding, Vec::from_slice(iv));
dec as ~Decryptor
}
}
Expand All @@ -319,35 +319,35 @@ pub fn ctr(
match key_size {
KeySize128 => {
let aes_dec = aesni::AesNi128Encryptor::new(key);
let dec = ~CtrMode::new(aes_dec, iv.to_owned());
let dec = ~CtrMode::new(aes_dec, Vec::from_slice(iv));
dec as ~SynchronousStreamCipher
}
KeySize192 => {
let aes_dec = aesni::AesNi192Encryptor::new(key);
let dec = ~CtrMode::new(aes_dec, iv.to_owned());
let dec = ~CtrMode::new(aes_dec, Vec::from_slice(iv));
dec as ~SynchronousStreamCipher
}
KeySize256 => {
let aes_dec = aesni::AesNi256Encryptor::new(key);
let dec = ~CtrMode::new(aes_dec, iv.to_owned());
let dec = ~CtrMode::new(aes_dec, Vec::from_slice(iv));
dec as ~SynchronousStreamCipher
}
}
} else {
match key_size {
KeySize128 => {
let aes_dec = aessafe::AesSafe128EncryptorX8::new(key);
let dec = ~CtrModeX8::new(aes_dec, iv.to_owned());
let dec = ~CtrModeX8::new(aes_dec, iv);
dec as ~SynchronousStreamCipher
}
KeySize192 => {
let aes_dec = aessafe::AesSafe192EncryptorX8::new(key);
let dec = ~CtrModeX8::new(aes_dec, iv.to_owned());
let dec = ~CtrModeX8::new(aes_dec, iv);
dec as ~SynchronousStreamCipher
}
KeySize256 => {
let aes_dec = aessafe::AesSafe256EncryptorX8::new(key);
let dec = ~CtrModeX8::new(aes_dec, iv.to_owned());
let dec = ~CtrModeX8::new(aes_dec, iv);
dec as ~SynchronousStreamCipher
}
}
Expand All @@ -363,17 +363,17 @@ pub fn ctr(
match key_size {
KeySize128 => {
let aes_dec = aessafe::AesSafe128Encryptor::new(key);
let dec = ~CtrModeX8::new(aes_dec, iv.to_owned());
let dec = ~CtrModeX8::new(aes_dec, Vec::from_slice(iv));
dec as ~SynchronousStreamCipher
}
KeySize192 => {
let aes_dec = aessafe::AesSafe192Encryptor::new(key);
let dec = ~CtrModeX8::new(aes_dec, iv.to_owned());
let dec = ~CtrModeX8::new(aes_dec, Vec::from_slice(iv));
dec as ~SynchronousStreamCipher
}
KeySize256 => {
let aes_dec = aessafe::AesSafe256Encryptor::new(key);
let dec = ~CtrModeX8::new(aes_dec, iv.to_owned());
let dec = ~CtrModeX8::new(aes_dec, Vec::from_slice(iv));
dec as ~SynchronousStreamCipher
}
}
Expand Down
Loading

0 comments on commit 4b330cd

Please sign in to comment.