Drop rustc-serialize dependency (a42c6e87) · Commits · Public Repositories / Rust Openssl

openssl/Cargo.toml

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ libc = "0.2"
		openssl-sys = { version = "0.9", path = "../openssl-sys" }

		[dev-dependencies]
		rustc-serialize = "0.3"
		tempdir = "0.3"
		winapi = "0.2"
		ws2_32-sys = "0.2"
		hex = "0.2"

openssl/src/hash.rs

+6 −6

Original line number	Diff line number	Diff line
		@@ -208,17 +208,17 @@ pub fn hash(t: MessageDigest, data: &[u8]) -> Result<Vec<u8>, ErrorStack> {

		#[cfg(test)]
		mod tests {
		use serialize::hex::{FromHex, ToHex};
		use hex::{FromHex, ToHex};
		use super::{hash, Hasher, MessageDigest};
		use std::io::prelude::*;

		fn hash_test(hashtype: MessageDigest, hashtest: &(&str, &str)) {
		let res = hash(hashtype, &*hashtest.0.from_hex().unwrap()).unwrap();
		let res = hash(hashtype, &Vec::from_hex(hashtest.0).unwrap()).unwrap();
		assert_eq!(res.to_hex(), hashtest.1);
		}

		fn hash_recycle_test(h: &mut Hasher, hashtest: &(&str, &str)) {
		let _ = h.write_all(&*hashtest.0.from_hex().unwrap()).unwrap();
		let _ = h.write_all(&Vec::from_hex(hashtest.0).unwrap()).unwrap();
		let res = h.finish().unwrap();
		assert_eq!(res.to_hex(), hashtest.1);
		}
		@@ -258,7 +258,7 @@ mod tests {
		#[test]
		fn test_finish_twice() {
		let mut h = Hasher::new(MessageDigest::md5()).unwrap();
		h.write_all(&*md5_tests[6].0.from_hex().unwrap()).unwrap();
		h.write_all(&Vec::from_hex(md5_tests[6].0).unwrap()).unwrap();
		h.finish().unwrap();
		let res = h.finish().unwrap();
		let null = hash(MessageDigest::md5(), &[]).unwrap();
		@@ -268,7 +268,7 @@ mod tests {
		#[test]
		fn test_clone() {
		let i = 7;
		let inp = md5_tests[i].0.from_hex().unwrap();
		let inp = Vec::from_hex(md5_tests[i].0).unwrap();
		assert!(inp.len() > 2);
		let p = inp.len() / 2;
		let h0 = Hasher::new(MessageDigest::md5()).unwrap();
		@@ -289,7 +289,7 @@ mod tests {

		println!("Clone a finished hasher");
		let mut h3 = h1.clone();
		h3.write_all(&*md5_tests[i + 1].0.from_hex().unwrap()).unwrap();
		h3.write_all(&Vec::from_hex(md5_tests[i + 1].0).unwrap()).unwrap();
		let res = h3.finish().unwrap();
		assert_eq!(res.to_hex(), md5_tests[i + 1].1);
		}

openssl/src/lib.rs

+1 −2

Original line number	Diff line number	Diff line
		@@ -8,8 +8,7 @@ extern crate lazy_static;
		extern crate openssl_sys as ffi;

		#[cfg(test)]
		extern crate rustc_serialize as serialize;

		extern crate hex;
		#[cfg(test)]
		extern crate tempdir;

openssl/src/pkcs12.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ pub struct ParsedPkcs12 {
		#[cfg(test)]
		mod test {
		use hash::MessageDigest;
		use serialize::hex::ToHex;
		use hex::ToHex;

		use super::*;

openssl/src/sign.rs

+17 −17

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ unsafe fn EVP_DigestVerifyFinal(ctx: *mut ffi::EVP_MD_CTX,

		#[cfg(test)]
		mod test {
		use serialize::hex::FromHex;
		use hex::FromHex;
		use std::iter;

		use hash::MessageDigest;
		@@ -339,27 +339,27 @@ mod test {
		let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 7] =
		[(iter::repeat(0x0b_u8).take(16).collect(),
		b"Hi There".to_vec(),
		"9294727a3638bb1c13f48ef8158bfc9d".from_hex().unwrap()),
		Vec::from_hex("9294727a3638bb1c13f48ef8158bfc9d").unwrap()),
		(b"Jefe".to_vec(),
		b"what do ya want for nothing?".to_vec(),
		"750c783e6ab0b503eaa86e310a5db738".from_hex().unwrap()),
		Vec::from_hex("750c783e6ab0b503eaa86e310a5db738").unwrap()),
		(iter::repeat(0xaa_u8).take(16).collect(),
		iter::repeat(0xdd_u8).take(50).collect(),
		"56be34521d144c88dbb8c733f0e8b3f6".from_hex().unwrap()),
		("0102030405060708090a0b0c0d0e0f10111213141516171819".from_hex().unwrap(),
		Vec::from_hex("56be34521d144c88dbb8c733f0e8b3f6").unwrap()),
		(Vec::from_hex("0102030405060708090a0b0c0d0e0f10111213141516171819").unwrap(),
		iter::repeat(0xcd_u8).take(50).collect(),
		"697eaf0aca3a3aea3a75164746ffaa79".from_hex().unwrap()),
		Vec::from_hex("697eaf0aca3a3aea3a75164746ffaa79").unwrap()),
		(iter::repeat(0x0c_u8).take(16).collect(),
		b"Test With Truncation".to_vec(),
		"56461ef2342edc00f9bab995690efd4c".from_hex().unwrap()),
		Vec::from_hex("56461ef2342edc00f9bab995690efd4c").unwrap()),
		(iter::repeat(0xaa_u8).take(80).collect(),
		b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(),
		"6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd".from_hex().unwrap()),
		Vec::from_hex("6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd").unwrap()),
		(iter::repeat(0xaa_u8).take(80).collect(),
		b"Test Using Larger Than Block-Size Key \
		and Larger Than One Block-Size Data"
		.to_vec(),
		"6f630fad67cda0ee1fb1f562db3aa53e".from_hex().unwrap())];
		Vec::from_hex("6f630fad67cda0ee1fb1f562db3aa53e").unwrap())];

		test_hmac(MessageDigest::md5(), &tests);
		}
		@@ -370,27 +370,27 @@ mod test {
		let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 7] =
		[(iter::repeat(0x0b_u8).take(20).collect(),
		b"Hi There".to_vec(),
		"b617318655057264e28bc0b6fb378c8ef146be00".from_hex().unwrap()),
		Vec::from_hex("b617318655057264e28bc0b6fb378c8ef146be00").unwrap()),
		(b"Jefe".to_vec(),
		b"what do ya want for nothing?".to_vec(),
		"effcdf6ae5eb2fa2d27416d5f184df9c259a7c79".from_hex().unwrap()),
		Vec::from_hex("effcdf6ae5eb2fa2d27416d5f184df9c259a7c79").unwrap()),
		(iter::repeat(0xaa_u8).take(20).collect(),
		iter::repeat(0xdd_u8).take(50).collect(),
		"125d7342b9ac11cd91a39af48aa17b4f63f175d3".from_hex().unwrap()),
		("0102030405060708090a0b0c0d0e0f10111213141516171819".from_hex().unwrap(),
		Vec::from_hex("125d7342b9ac11cd91a39af48aa17b4f63f175d3").unwrap()),
		(Vec::from_hex("0102030405060708090a0b0c0d0e0f10111213141516171819").unwrap(),
		iter::repeat(0xcd_u8).take(50).collect(),
		"4c9007f4026250c6bc8414f9bf50c86c2d7235da".from_hex().unwrap()),
		Vec::from_hex("4c9007f4026250c6bc8414f9bf50c86c2d7235da").unwrap()),
		(iter::repeat(0x0c_u8).take(20).collect(),
		b"Test With Truncation".to_vec(),
		"4c1a03424b55e07fe7f27be1d58bb9324a9a5a04".from_hex().unwrap()),
		Vec::from_hex("4c1a03424b55e07fe7f27be1d58bb9324a9a5a04").unwrap()),
		(iter::repeat(0xaa_u8).take(80).collect(),
		b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(),
		"aa4ae5e15272d00e95705637ce8a3b55ed402112".from_hex().unwrap()),
		Vec::from_hex("aa4ae5e15272d00e95705637ce8a3b55ed402112").unwrap()),
		(iter::repeat(0xaa_u8).take(80).collect(),
		b"Test Using Larger Than Block-Size Key \
		and Larger Than One Block-Size Data"
		.to_vec(),
		"e8e99d0f45237d786d6bbaa7965c7808bbff1a91".from_hex().unwrap())];
		Vec::from_hex("e8e99d0f45237d786d6bbaa7965c7808bbff1a91").unwrap())];

		test_hmac(MessageDigest::sha1(), &tests);
		}