3 files changed, 18 insertions, 69 deletions
diff --git a/nitrocli/CHANGELOG.md b/nitrocli/CHANGELOG.md
index fec91fb..98296eb 100644
--- a/nitrocli/CHANGELOG.md
+++ b/nitrocli/CHANGELOG.md
@@ -3,7 +3,8 @@ Unreleased
 - Store cached PINs on a per-device basis to better support multi-device
   scenarios
 - Further decreased binary size by using system allocator
-- Bumped `nitrokey` dependency to `0.3.2`
+- Bumped `nitrokey` dependency to `0.3.3`
+  - Bumped `rand` dependency to `0.6.4`
 - Bumped `nitrokey-sys` dependency to `3.4.3`
 - Bumped `libc` dependency to `0.2.46`
 
diff --git a/nitrocli/Cargo.lock b/nitrocli/Cargo.lock
index 092dc92..2f01846 100644
--- a/nitrocli/Cargo.lock
+++ b/nitrocli/Cargo.lock
@@ -76,18 +76,19 @@ dependencies = [
  "argparse 0.2.2",
  "base32 0.4.0",
  "libc 0.2.46",
- "nitrokey 0.3.2",
+ "nitrokey 0.3.3",
  "nitrokey-test 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "nitrokey"
-version = "0.3.2"
+version = "0.3.3"
 dependencies = [
  "libc 0.2.46",
  "nitrokey-sys 3.4.3",
- "rand 0.6.1",
+ "rand_core 0.3.0",
+ "rand_os 0.1.1",
 ]
 
 [[package]]
@@ -124,59 +125,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand"
-version = "0.6.1"
-dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.46",
- "rand_chacha 0.1.0",
- "rand_core 0.3.0",
- "rand_hc 0.1.0",
- "rand_isaac 0.1.0",
- "rand_pcg 0.1.1",
- "rand_xorshift 0.1.0",
- "rustc_version 0.2.3",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.1.0"
-dependencies = [
- "rand_core 0.3.0",
- "rustc_version 0.2.3",
-]
-
-[[package]]
 name = "rand_core"
 version = "0.3.0"
 
 [[package]]
-name = "rand_hc"
-version = "0.1.0"
-dependencies = [
- "rand_core 0.3.0",
-]
-
-[[package]]
-name = "rand_isaac"
-version = "0.1.0"
-dependencies = [
- "rand_core 0.3.0",
-]
-
-[[package]]
-name = "rand_pcg"
+name = "rand_os"
 version = "0.1.1"
 dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.46",
  "rand_core 0.3.0",
- "rustc_version 0.2.3",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_xorshift"
-version = "0.1.0"
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "rand_core 0.3.0",
 ]
@@ -202,24 +169,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustc_version"
-version = "0.2.3"
-dependencies = [
- "semver 0.9.0",
-]
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-dependencies = [
- "semver-parser 0.7.0",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-
-[[package]]
 name = "syn"
 version = "0.15.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -288,6 +237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum nitrokey-test 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6226eaa31d1bbb031314d9288eb0e1bf6a70e7053da7960fea13ee84cab330ea"
 "checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"
 "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 "checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
 "checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
 "checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc"
diff --git a/nitrocli/Cargo.toml b/nitrocli/Cargo.toml
index 7b8dfc7..fe4ad7f 100644
--- a/nitrocli/Cargo.toml
+++ b/nitrocli/Cargo.toml
@@ -67,7 +67,5 @@ cc = { path = "../cc" }
 libc = { path = "../libc" }
 nitrokey = { path = "../nitrokey" }
 nitrokey-sys = { path = "../nitrokey-sys" }
-rand = { path = "../rand" }
-rustc_version = { path = "../rustc_version" }
-semver = { path = "../semver" }
-semver-parser = { path = "../semver-parser" }
+rand_core = { path = "../rand/rand_core" }
+rand_os = { path = "../rand/rand_os" }