diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2018-08-28 13:49:19 -0400 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2018-08-30 08:29:28 -0400 |
commit | d8d5c421c33b1cc5416ff87f6a7c3837e5176d4d (patch) | |
tree | e43b4ae5a48f465d54f6d229f0edde131d84823c /src/deno_dir.rs | |
parent | 11896647e6a31122ee8c015e2cc6093e448029d6 (diff) |
Support https imports.
Adds hyper-rustls to the build.
Use ring for sha1 instead of "ssh1" crate.
Fixes #528.
Diffstat (limited to 'src/deno_dir.rs')
-rw-r--r-- | src/deno_dir.rs | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/deno_dir.rs b/src/deno_dir.rs index 45ce7db28..0a3557d5b 100644 --- a/src/deno_dir.rs +++ b/src/deno_dir.rs @@ -3,17 +3,17 @@ use errors::DenoError; use errors::DenoResult; use fs as deno_fs; use net; -use sha1; +use ring; use std; +use std::fmt::Write; use std::fs; use std::path::Path; use std::path::PathBuf; use std::result::Result; -use url; -use url::Url; - #[cfg(test)] use tempfile::TempDir; +use url; +use url::Url; pub struct DenoDir { // Example: /Users/rld/.deno/ @@ -331,10 +331,16 @@ fn test_code_cache() { // https://github.com/denoland/deno/blob/golang/deno_dir.go#L25-L30 fn source_code_hash(filename: &str, source_code: &str) -> String { - let mut m = sha1::Sha1::new(); - m.update(filename.as_bytes()); - m.update(source_code.as_bytes()); - m.digest().to_string() + let mut ctx = ring::digest::Context::new(&ring::digest::SHA1); + ctx.update(filename.as_bytes()); + ctx.update(source_code.as_bytes()); + let digest = ctx.finish(); + let mut out = String::new(); + // TODO There must be a better way to do this... + for byte in digest.as_ref() { + write!(&mut out, "{:02x}", byte).unwrap(); + } + out } #[test] |