diff options
| author | Steven Fackler <[email protected]> | 2014-05-05 21:10:09 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-05-05 21:10:09 -0700 |
| commit | c4b5070a20694bdf5b8485a1494d604f69dc23e8 (patch) | |
| tree | 26327a9471f7b4127842d94132ddad0c2e07ee64 | |
| parent | Merge pull request #10 from Noxivs/master (diff) | |
| download | rust-openssl-c4b5070a20694bdf5b8485a1494d604f69dc23e8.tar.xz rust-openssl-c4b5070a20694bdf5b8485a1494d604f69dc23e8.zip | |
Update tests for ~"" change
| -rw-r--r-- | crypto/hash.rs | 34 | ||||
| -rw-r--r-- | crypto/symm.rs | 8 |
2 files changed, 21 insertions, 21 deletions
diff --git a/crypto/hash.rs b/crypto/hash.rs index fdf7e625..57b9fdbf 100644 --- a/crypto/hash.rs +++ b/crypto/hash.rs @@ -111,9 +111,9 @@ mod tests { expected_output: ~str } - fn HashTest(input: ~str, output: ~str) -> HashTest { + fn HashTest(input: &str, output: &str) -> HashTest { HashTest { input: input.from_hex().unwrap(), - expected_output: output } + expected_output: output.to_owned() } } fn hash_test(hashtype: super::HashType, hashtest: &HashTest) { @@ -132,19 +132,19 @@ mod tests { #[test] fn test_md5() { let tests = [ - HashTest(~"", ~"d41d8cd98f00b204e9800998ecf8427e"), - HashTest(~"7F", ~"83acb6e67e50e31db6ed341dd2de1595"), - HashTest(~"EC9C", ~"0b07f0d4ca797d8ac58874f887cb0b68"), - HashTest(~"FEE57A", ~"e0d583171eb06d56198fc0ef22173907"), - HashTest(~"42F497E0", ~"7c430f178aefdf1487fee7144e9641e2"), - HashTest(~"C53B777F1C", ~"75ef141d64cb37ec423da2d9d440c925"), - HashTest(~"89D5B576327B", ~"ebbaf15eb0ed784c6faa9dc32831bf33"), - HashTest(~"5D4CCE781EB190", ~"ce175c4b08172019f05e6b5279889f2c"), - HashTest(~"81901FE94932D7B9", ~"cd4d2f62b8cdb3a0cf968a735a239281"), - HashTest(~"C9FFDEE7788EFB4EC9", ~"e0841a231ab698db30c6c0f3f246c014"), - HashTest(~"66AC4B7EBA95E53DC10B", ~"a3b3cea71910d9af56742aa0bb2fe329"), - HashTest(~"A510CD18F7A56852EB0319", ~"577e216843dd11573574d3fb209b97d8"), - HashTest(~"AAED18DBE8938C19ED734A8D", ~"6f80fb775f27e0a4ce5c2f42fc72c5f1")]; + HashTest("", "d41d8cd98f00b204e9800998ecf8427e"), + HashTest("7F", "83acb6e67e50e31db6ed341dd2de1595"), + HashTest("EC9C", "0b07f0d4ca797d8ac58874f887cb0b68"), + HashTest("FEE57A", "e0d583171eb06d56198fc0ef22173907"), + HashTest("42F497E0", "7c430f178aefdf1487fee7144e9641e2"), + HashTest("C53B777F1C", "75ef141d64cb37ec423da2d9d440c925"), + HashTest("89D5B576327B", "ebbaf15eb0ed784c6faa9dc32831bf33"), + HashTest("5D4CCE781EB190", "ce175c4b08172019f05e6b5279889f2c"), + HashTest("81901FE94932D7B9", "cd4d2f62b8cdb3a0cf968a735a239281"), + HashTest("C9FFDEE7788EFB4EC9", "e0841a231ab698db30c6c0f3f246c014"), + HashTest("66AC4B7EBA95E53DC10B", "a3b3cea71910d9af56742aa0bb2fe329"), + HashTest("A510CD18F7A56852EB0319", "577e216843dd11573574d3fb209b97d8"), + HashTest("AAED18DBE8938C19ED734A8D", "6f80fb775f27e0a4ce5c2f42fc72c5f1")]; for test in tests.iter() { hash_test(super::MD5, test); @@ -154,7 +154,7 @@ mod tests { #[test] fn test_sha1() { let tests = [ - HashTest(~"616263", ~"a9993e364706816aba3e25717850c26c9cd0d89d"), + HashTest("616263", "a9993e364706816aba3e25717850c26c9cd0d89d"), ]; for test in tests.iter() { @@ -165,7 +165,7 @@ mod tests { #[test] fn test_sha256() { let tests = [ - HashTest(~"616263", ~"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad") + HashTest("616263", "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad") ]; for test in tests.iter() { diff --git a/crypto/symm.rs b/crypto/symm.rs index a12e8b41..24992153 100644 --- a/crypto/symm.rs +++ b/crypto/symm.rs @@ -244,10 +244,10 @@ mod tests { #[test] fn test_rc4() { - let pt = ~"0000000000000000000000000000000000000000000000000000000000000000000000000000"; - let ct = ~"A68686B04D686AA107BD8D4CAB191A3EEC0A6294BC78B60F65C25CB47BD7BB3A48EFC4D26BE4"; - let key = ~"97CD440324DA5FD1F7955C1C13B6B466"; - let iv = ~""; + let pt = "0000000000000000000000000000000000000000000000000000000000000000000000000000".to_owned(); + let ct = "A68686B04D686AA107BD8D4CAB191A3EEC0A6294BC78B60F65C25CB47BD7BB3A48EFC4D26BE4".to_owned(); + let key = "97CD440324DA5FD1F7955C1C13B6B466".to_owned(); + let iv = "".to_owned(); cipher_test(super::RC4_128, pt, ct, key, iv); } |