diff options
| author | Michael Gehring <[email protected]> | 2014-09-23 20:27:37 +0200 |
|---|---|---|
| committer | Michael Gehring <[email protected]> | 2014-09-23 20:27:37 +0200 |
| commit | da125b3a9563bf909708e8868d7d065f8b8ed2fe (patch) | |
| tree | ea8b8484ae5f1508c23c9d3176dcbe1b0d363208 /src/crypto/hmac.rs | |
| parent | Merge pull request #50 from vhbit/cert-fingerprint (diff) | |
| download | rust-openssl-da125b3a9563bf909708e8868d7d065f8b8ed2fe.tar.xz rust-openssl-da125b3a9563bf909708e8868d7d065f8b8ed2fe.zip | |
Fix deprecation warnings
Diffstat (limited to 'src/crypto/hmac.rs')
| -rw-r--r-- | src/crypto/hmac.rs | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/crypto/hmac.rs b/src/crypto/hmac.rs index 88cd2c1f..5bf62586 100644 --- a/src/crypto/hmac.rs +++ b/src/crypto/hmac.rs @@ -91,10 +91,10 @@ mod tests { fn test_hmac_md5() { // test vectors from RFC 2202 let tests: [(Vec<u8>, Vec<u8>, Vec<u8>), ..7] = [ - (Vec::from_elem(16, 0x0b_u8), Vec::from_slice(b"Hi There"), + (Vec::from_elem(16, 0x0b_u8), b"Hi There".to_vec(), "9294727a3638bb1c13f48ef8158bfc9d".from_hex().unwrap()), - (Vec::from_slice(b"Jefe"), - Vec::from_slice(b"what do ya want for nothing?"), + (b"Jefe".to_vec(), + b"what do ya want for nothing?".to_vec(), "750c783e6ab0b503eaa86e310a5db738".from_hex().unwrap()), (Vec::from_elem(16, 0xaa_u8), Vec::from_elem(50, 0xdd_u8), "56be34521d144c88dbb8c733f0e8b3f6".from_hex().unwrap()), @@ -102,14 +102,14 @@ mod tests { Vec::from_elem(50, 0xcd_u8), "697eaf0aca3a3aea3a75164746ffaa79".from_hex().unwrap()), (Vec::from_elem(16, 0x0c_u8), - Vec::from_slice(b"Test With Truncation"), + b"Test With Truncation".to_vec(), "56461ef2342edc00f9bab995690efd4c".from_hex().unwrap()), (Vec::from_elem(80, 0xaa_u8), - Vec::from_slice(b"Test Using Larger Than Block-Size Key - Hash Key First"), + b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(), "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd".from_hex().unwrap()), (Vec::from_elem(80, 0xaa_u8), - Vec::from_slice(b"Test Using Larger Than Block-Size Key \ - and Larger Than One Block-Size Data"), + b"Test Using Larger Than Block-Size Key \ + and Larger Than One Block-Size Data".to_vec(), "6f630fad67cda0ee1fb1f562db3aa53e".from_hex().unwrap()) ]; @@ -124,10 +124,10 @@ mod tests { fn test_hmac_sha1() { // test vectors from RFC 2202 let tests: [(Vec<u8>, Vec<u8>, Vec<u8>), ..7] = [ - (Vec::from_elem(20, 0x0b_u8), Vec::from_slice(b"Hi There"), + (Vec::from_elem(20, 0x0b_u8), b"Hi There".to_vec(), "b617318655057264e28bc0b6fb378c8ef146be00".from_hex().unwrap()), - (Vec::from_slice(b"Jefe"), - Vec::from_slice(b"what do ya want for nothing?"), + (b"Jefe".to_vec(), + b"what do ya want for nothing?".to_vec(), "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79".from_hex().unwrap()), (Vec::from_elem(20, 0xaa_u8), Vec::from_elem(50, 0xdd_u8), "125d7342b9ac11cd91a39af48aa17b4f63f175d3".from_hex().unwrap()), @@ -135,14 +135,14 @@ mod tests { Vec::from_elem(50, 0xcd_u8), "4c9007f4026250c6bc8414f9bf50c86c2d7235da".from_hex().unwrap()), (Vec::from_elem(20, 0x0c_u8), - Vec::from_slice(b"Test With Truncation"), + b"Test With Truncation".to_vec(), "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04".from_hex().unwrap()), (Vec::from_elem(80, 0xaa_u8), - Vec::from_slice(b"Test Using Larger Than Block-Size Key - Hash Key First"), + b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(), "aa4ae5e15272d00e95705637ce8a3b55ed402112".from_hex().unwrap()), (Vec::from_elem(80, 0xaa_u8), - Vec::from_slice(b"Test Using Larger Than Block-Size Key \ - and Larger Than One Block-Size Data"), + b"Test Using Larger Than Block-Size Key \ + and Larger Than One Block-Size Data".to_vec(), "e8e99d0f45237d786d6bbaa7965c7808bbff1a91".from_hex().unwrap()) ]; @@ -156,18 +156,18 @@ mod tests { fn test_sha2(ty: HashType, results: &[Vec<u8>]) { // test vectors from RFC 4231 let tests: [(Vec<u8>, Vec<u8>), ..6] = [ - (Vec::from_elem(20, 0x0b_u8), Vec::from_slice(b"Hi There")), - (Vec::from_slice(b"Jefe"), - Vec::from_slice(b"what do ya want for nothing?")), + (Vec::from_elem(20, 0x0b_u8), b"Hi There".to_vec()), + (b"Jefe".to_vec(), + b"what do ya want for nothing?".to_vec()), (Vec::from_elem(20, 0xaa_u8), Vec::from_elem(50, 0xdd_u8)), ("0102030405060708090a0b0c0d0e0f10111213141516171819".from_hex().unwrap(), Vec::from_elem(50, 0xcd_u8)), (Vec::from_elem(131, 0xaa_u8), - Vec::from_slice(b"Test Using Larger Than Block-Size Key - Hash Key First")), + b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec()), (Vec::from_elem(131, 0xaa_u8), - Vec::from_slice(b"This is a test using a larger than block-size key and a \ - larger than block-size data. The key needs to be hashed \ - before being used by the HMAC algorithm.")) + b"This is a test using a larger than block-size key and a \ + larger than block-size data. The key needs to be hashed \ + before being used by the HMAC algorithm.".to_vec()) ]; for (&(ref key, ref data), res) in tests.iter().zip(results.iter()) { |