Replace rust-crypto with a copy of rustc's SHA-256

brson · brson · commit 5e3ee9afcc50 · 2016-05-06T03:33:39.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,6 @@ rustup-utils = { path = "src/rustup-utils", version = "0.1.9" }
 error-chain = { path = "src/error-chain", version = "0.1.9" }
 clap = "2.2.4"
 regex = "0.1.41"
-rust-crypto = "0.2.35"
 url = "1.1.0"
 term = "0.4.4"
 itertools = "0.4.1"
diff --git a/src/rustup-cli/main.rs b/src/rustup-cli/main.rs
@@ -12,7 +12,6 @@ extern crate regex;
 #[macro_use]
 extern crate rustup;
 extern crate term;
-extern crate crypto;
 extern crate itertools;
 extern crate time;
 extern crate rand;
diff --git a/src/rustup-cli/self_update.rs b/src/rustup-cli/self_update.rs
@@ -36,8 +36,7 @@ use rustup::{NotifyHandler};
 use errors::*;
 use rustup_dist::dist;
 use rustup_utils::utils;
-use crypto::sha2::Sha256;
-use crypto::digest::Digest;
+use rustup_utils::sha2::{Sha256, Digest};
 use std::env;
 use std::env::consts::EXE_SUFFIX;
 use std::path::{Path, PathBuf};
diff --git a/src/rustup-dist/Cargo.toml b/src/rustup-dist/Cargo.toml
@@ -14,7 +14,6 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 regex = "0.1.41"
-rust-crypto = "0.2.35"
 itertools = "0.4.1"
 ole32-sys = "0.2.0"
 url = "1.1.0"
diff --git a/src/rustup-dist/src/dist.rs b/src/rustup-dist/src/dist.rs
@@ -12,8 +12,7 @@ use std::path::Path;
 use std::fmt;
 
 use regex::Regex;
-use crypto::sha2::Sha256;
-use crypto::digest::Digest;
+use rustup_utils::sha2::{Sha256, Digest};
 use itertools::Itertools;
 
 pub const DEFAULT_DIST_ROOT: &'static str = "https://static.rust-lang.org/dist";
diff --git a/src/rustup-dist/src/download.rs b/src/rustup-dist/src/download.rs
@@ -3,8 +3,7 @@ use notifications::*;
 use rustup_utils::utils;
 use temp;
 
-use crypto::sha2::Sha256;
-use crypto::digest::Digest;
+use rustup_utils::sha2::{Sha256, Digest};
 
 use std::path::Path;
 use std::process::Command;
diff --git a/src/rustup-dist/src/lib.rs b/src/rustup-dist/src/lib.rs
@@ -1,7 +1,6 @@
 #![recursion_limit = "1024"]
 
 extern crate regex;
-extern crate crypto;
 extern crate itertools;
 extern crate tempdir;
 extern crate walkdir;
diff --git a/src/rustup-dist/src/manifestation.rs b/src/rustup-dist/src/manifestation.rs
@@ -10,8 +10,7 @@ use errors::*;
 use notifications::*;
 use rustup_utils::utils;
 use prefix::InstallPrefix;
-use crypto::sha2::Sha256;
-use crypto::digest::Digest;
+use rustup_utils::sha2::{Sha256, Digest};
 use itertools::Itertools;
 use std::path::Path;
 
diff --git a/src/rustup-mock/Cargo.toml b/src/rustup-mock/Cargo.toml
@@ -16,10 +16,10 @@ lazy_static = "0.1.15"
 walkdir = "0.1.5"
 flate2 = "0.2.9"
 tempdir = "0.3.4"
-rust-crypto = "0.2.35"
 itertools = "0.4.1"
 tar = "0.4.0"
 toml = "0.1.27"
+rustup-utils = { path = "../rustup-utils", version = "0.1.9" }
 
 [target."cfg(windows)".dependencies]
 winapi = "0.2.4"
diff --git a/src/rustup-mock/src/dist.rs b/src/rustup-mock/src/dist.rs
@@ -8,8 +8,7 @@ use std::fs::{self, File};
 use std::collections::HashMap;
 use std::io::{Read, Write};
 use tempdir::TempDir;
-use crypto::sha2::Sha256;
-use crypto::digest::Digest;
+use rustup_utils::sha2::{Sha256, Digest};
 use itertools::Itertools;
 use toml;
 use flate2;
diff --git a/src/rustup-mock/src/lib.rs b/src/rustup-mock/src/lib.rs
@@ -7,10 +7,10 @@ extern crate scopeguard;
 extern crate walkdir;
 extern crate flate2;
 extern crate tempdir;
-extern crate crypto;
 extern crate itertools;
 extern crate tar;
 extern crate toml;
+extern crate rustup_utils;
 
 #[cfg(windows)]
 extern crate winapi;
diff --git a/src/rustup-utils/Cargo.toml b/src/rustup-utils/Cargo.toml
@@ -12,12 +12,12 @@ repository = "https://github.com/rust-lang-nursery/rustup.rs"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-rust-crypto = "0.2.35"
 rand = "0.3.11"
 scopeguard = "0.1.2"
 error-chain = { path = "../error-chain", version = "0.1.9" }
 libc = "0.2.0"
 native-tls = { git = "https://github.com/sfackler/rust-native-tls.git" }
+rustc-serialize = "0.3.19"
 
 [target."cfg(windows)".dependencies]
 winapi = "0.2.4"
diff --git a/src/rustup-utils/src/lib.rs b/src/rustup-utils/src/lib.rs
@@ -1,14 +1,15 @@
 #![feature(core_intrinsics)] // For type_name().
 #![feature(fundamental)]
+#![feature(step_by)]
 #![recursion_limit = "1024"] // for error_chain!
 
 extern crate hyper;
-extern crate crypto;
 extern crate rand;
 extern crate scopeguard;
 #[macro_use]
 extern crate error_chain;
 extern crate native_tls;
+extern crate rustc_serialize;
 
 #[cfg(windows)]
 extern crate winapi;
@@ -34,6 +35,7 @@ pub mod notifications;
 pub mod raw;
 pub mod tty;
 pub mod utils;
+pub mod sha2;
 
 pub use errors::*;
 pub use notifications::{Notification, NotifyHandler};
diff --git a/src/rustup-utils/src/raw.rs b/src/rustup-utils/src/raw.rs
@@ -12,8 +12,7 @@ use std::fmt;
 use std::thread;
 use std::time::Duration;
 use hyper::{self, Client};
-use crypto::sha2::Sha256;
-use crypto::digest::Digest;
+use sha2::{Sha256, Digest};
 use errors::*;
 
 use rand::random;
diff --git a/src/rustup-utils/src/sha2.rs b/src/rustup-utils/src/sha2.rs
diff --git a/src/rustup-utils/src/utils.rs b/src/rustup-utils/src/utils.rs
