aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2014-02-13 19:31:39 -0800
committerSteven Fackler <[email protected]>2014-02-13 19:31:39 -0800
commit3acd8f8de95cdc386924aa0fadd55ea58008f961 (patch)
tree304907f7abd629770d21dcec6a046b945102e00a
parentMake Makefile variables early evaluated (diff)
downloadrust-openssl-3acd8f8de95cdc386924aa0fadd55ea58008f961.tar.xz
rust-openssl-3acd8f8de95cdc386924aa0fadd55ea58008f961.zip
Update for hex move
-rw-r--r--crypto/hash.rs2
-rw-r--r--crypto/symm.rs4
-rw-r--r--lib.rs2
3 files changed, 5 insertions, 3 deletions
diff --git a/crypto/hash.rs b/crypto/hash.rs
index cb606d66..9a1a078a 100644
--- a/crypto/hash.rs
+++ b/crypto/hash.rs
@@ -105,7 +105,7 @@ pub fn hash(t: HashType, data: &[u8]) -> ~[u8] {
#[cfg(test)]
mod tests {
- use extra::hex::{FromHex, ToHex};
+ use serialize::hex::{FromHex, ToHex};
struct HashTest {
input: ~[u8],
diff --git a/crypto/symm.rs b/crypto/symm.rs
index 3f27d117..84900447 100644
--- a/crypto/symm.rs
+++ b/crypto/symm.rs
@@ -194,7 +194,7 @@ pub fn decrypt(t: Type, key: &[u8], iv: ~[u8], data: &[u8]) -> ~[u8] {
#[cfg(test)]
mod tests {
- use extra::hex::FromHex;
+ use serialize::hex::FromHex;
// Test vectors from FIPS-197:
// 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) {
- use extra::hex::ToHex;
+ use serialize::hex::ToHex;
let cipher = super::Crypter::new(ciphertype);
cipher.init(super::Encrypt, key.from_hex().unwrap(), iv.from_hex().unwrap());
diff --git a/lib.rs b/lib.rs
index 0be3edf2..842f9fe8 100644
--- a/lib.rs
+++ b/lib.rs
@@ -5,6 +5,8 @@
#[doc(html_root_url="http://www.rust-ci.org/sfackler/rust-openssl/doc")];
extern mod extra;
+#[cfg(test)]
+extern mod serialize;
extern mod sync;
pub mod ssl;