diff options
| author | Steven Fackler <[email protected]> | 2014-04-18 23:56:01 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-04-18 23:56:01 -0700 |
| commit | cfc79313f59b18a0e6d11002185b503b1590f9d3 (patch) | |
| tree | 089df2dfd4add719df49095e6e92f71303cdbe7d /crypto/hash.rs | |
| parent | Update for IO changes (diff) | |
| download | rust-openssl-cfc79313f59b18a0e6d11002185b503b1590f9d3.tar.xz rust-openssl-cfc79313f59b18a0e6d11002185b503b1590f9d3.zip | |
Update for ~[T] changes
Diffstat (limited to 'crypto/hash.rs')
| -rw-r--r-- | crypto/hash.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crypto/hash.rs b/crypto/hash.rs index ed617be6..fdf7e625 100644 --- a/crypto/hash.rs +++ b/crypto/hash.rs @@ -1,7 +1,6 @@ use libc; use libc::c_uint; use std::ptr; -use std::slice; pub enum HashType { MD5, @@ -76,9 +75,9 @@ impl Hasher { * Return the digest of all bytes added to this hasher since its last * initialization */ - pub fn final(&self) -> ~[u8] { + pub fn final(&self) -> Vec<u8> { unsafe { - let mut res = slice::from_elem(self.len, 0u8); + let mut res = Vec::from_elem(self.len, 0u8); EVP_DigestFinal(self.ctx, res.as_mut_ptr(), ptr::null()); res } @@ -97,7 +96,7 @@ impl Drop for Hasher { * Hashes the supplied input data using hash t, returning the resulting hash * value */ -pub fn hash(t: HashType, data: &[u8]) -> ~[u8] { +pub fn hash(t: HashType, data: &[u8]) -> Vec<u8> { let h = Hasher::new(t); h.update(data); h.final() @@ -120,7 +119,7 @@ mod tests { fn hash_test(hashtype: super::HashType, hashtest: &HashTest) { let calced_raw = super::hash(hashtype, hashtest.input); - let calced = calced_raw.to_hex(); + let calced = calced_raw.as_slice().to_hex(); if calced != hashtest.expected_output { println!("Test failed - {} != {}", calced, hashtest.expected_output); |