min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for hex move

This commit is contained in:
Steven Fackler 2014-02-13 19:31:39 -08:00
parent a88b7c0e3c
commit 3acd8f8de9
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/hash.rs
View File

@ -105,7 +105,7 @@ pub fn hash(t: HashType, data: &[u8]) -> ~[u8] {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use extra::hex::{FromHex, ToHex}; use serialize::hex::{FromHex, ToHex};
struct HashTest { struct HashTest {
input: ~[u8], input: ~[u8],

4
crypto/symm.rs
View File

@ -194,7 +194,7 @@ pub fn decrypt(t: Type, key: &[u8], iv: ~[u8], data: &[u8]) -> ~[u8] {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use extra::hex::FromHex; use serialize::hex::FromHex;
// Test vectors from FIPS-197: // Test vectors from FIPS-197:
// http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf // http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
@ -223,7 +223,7 @@ mod tests {
} }
fn cipher_test(ciphertype: super::Type, pt: ~str, ct: ~str, key: ~str, iv: ~str) { fn cipher_test(ciphertype: super::Type, pt: ~str, ct: ~str, key: ~str, iv: ~str) {
use extra::hex::ToHex; use serialize::hex::ToHex;
let cipher = super::Crypter::new(ciphertype); let cipher = super::Crypter::new(ciphertype);
cipher.init(super::Encrypt, key.from_hex().unwrap(), iv.from_hex().unwrap()); cipher.init(super::Encrypt, key.from_hex().unwrap(), iv.from_hex().unwrap());

2
lib.rs
View File

@ -5,6 +5,8 @@
#[doc(html_root_url="http://www.rust-ci.org/sfackler/rust-openssl/doc")]; #[doc(html_root_url="http://www.rust-ci.org/sfackler/rust-openssl/doc")];
extern mod extra; extern mod extra;
#[cfg(test)]
extern mod serialize;
extern mod sync; extern mod sync;
pub mod ssl; pub mod ssl;