matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Reimplement hash generation with rust-crypto

Browse source
This commit is contained in:
Matthias Beyer 2016-04-16 14:26:53 +02:00
parent 781498832b
commit f482c2564b
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libimaglink/src/external.rs
View file

@ -32,8 +32,8 @@ use module_path::ModuleEntryPath;
use toml::Value; use toml::Value;
use toml::Table; use toml::Table;
use url::Url; use url::Url;
use sodiumoxide::crypto::hash; use crypto::sha1::Sha1;
use sodiumoxide::crypto::hash::sha512::Digest; use crypto::digest::Digest;
/// "Link" Type, just an abstraction over FileLockEntry to have some convenience internally. /// "Link" Type, just an abstraction over FileLockEntry to have some convenience internally.
struct Link<'a> { struct Link<'a> {
@ -158,23 +158,14 @@ impl ExternalLinker for Entry {
// store entries and store the other URIs in the header of one FileLockEntry each, in // store entries and store the other URIs in the header of one FileLockEntry each, in
// the path /link/external/<SHA of the URL> // the path /link/external/<SHA of the URL>
/// Convert a hash::sha512::Digest from sodiumoxide into a StoreId
fn hash_to_storeid(d: Digest) -> StoreId {
let hash = &d[..];
let v = Vec::from(hash);
let s = String::from_utf8(v).unwrap(); // TODO: Uncaught unwrap()
debug!("Generating store id for digest: '{:?}' == {}", d, s);
let id = ModuleEntryPath::new(format!("external/{}", s)).into_storeid();
debug!("Generted store id: '{:?}'", id);
id
}
debug!("Iterating {} links = {:?}", links.len(), links); debug!("Iterating {} links = {:?}", links.len(), links);
for link in links { // for all links for link in links { // for all links
let hash = hash::hash(link.serialize().as_bytes()); let hash = {
let file_id = hash_to_storeid(hash); let mut s = Sha1::new();
s.input_str(&link.serialize()[..]);
s.result_str()
};
let file_id = ModuleEntryPath::new(format!("external/{}", hash)).into_storeid();
debug!("Link = '{:?}'", link); debug!("Link = '{:?}'", link);
debug!("Hash = '{:?}'", hash); debug!("Hash = '{:?}'", hash);