From e873f47c56fded9282d23d6f09d09d924c313d07 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Sun, 17 Nov 2019 21:33:08 +0000
Subject: [PATCH] Use OsRng consistently from rand

rand_os disappears part-way through the rand 0.7 series, so may as well
move away from it now.
---
 Cargo.lock  | 1 -
 Cargo.toml  | 1 -
 src/keys.rs | 6 +++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d337c52..81a43eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -40,7 +40,6 @@ dependencies = [
  "nom 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-bigint-dig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rsa 0.1.4-alpha.0 (git+https://github.com/lucdew/RSA?branch=oaep)",
  "scrypt 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 7b8d56c..7e736c3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,6 @@ hkdf = "0.8"
 hmac = "0.7"
 nom = "5"
 num-bigint-dig = "0.4"
-rand_os = "0.1"
 rand = "0.6"
 rsa = { git = "https://github.com/lucdew/RSA", branch = "oaep" }
 scrypt = { version = "0.2", default-features = false }
diff --git a/src/keys.rs b/src/keys.rs
index ee1ff9e..34a023f 100644
--- a/src/keys.rs
+++ b/src/keys.rs
@@ -1,7 +1,7 @@
 //! Key structs and serialization.
 
 use curve25519_dalek::edwards::EdwardsPoint;
-use rand_os::OsRng;
+use rand::rngs::OsRng;
 use sha2::{Digest, Sha256, Sha512};
 use std::io::{self, BufRead};
 use x25519_dalek::{EphemeralSecret, PublicKey, StaticSecret};
@@ -106,7 +106,7 @@ impl SecretKey {
                     return None;
                 }
 
-                let mut rng = rand::rngs::OsRng::new().expect("should have RNG");
+                let mut rng = OsRng::new().expect("should have RNG");
                 let mut h = Sha256::default();
 
                 rsa::oaep::decrypt(
@@ -226,7 +226,7 @@ impl RecipientKey {
                 RecipientLine::x25519(epk, encrypted_file_key)
             }
             RecipientKey::SshRsa(ssh_key, pk) => {
-                let mut rng = rand::rngs::OsRng::new().expect("should have RNG");
+                let mut rng = OsRng::new().expect("should have RNG");
                 let mut h = Sha256::default();
 
                 let encrypted_file_key = rsa::oaep::encrypt(