Update nitrokey to 0.3.3

parent 2bc9ee7e
rust-nitrokey (0.2.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
rust-nitrokey (0.3.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
* Package nitrokey 0.2.3 from crates.io using debcargo 2.2.9
* Package nitrokey 0.3.3 from crates.io using debcargo 2.2.9
-- Robin Krahl <robin.krahl@ireas.org> Mon, 31 Dec 2018 14:12:48 +0000
-- Robin Krahl <robin.krahl@ireas.org> Sat, 19 Jan 2019 23:57:15 +0000
......@@ -9,8 +9,8 @@ License: MIT
Files: debian/*
Copyright:
2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
2018 Robin Krahl <robin.krahl@ireas.org>
2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
2019 Robin Krahl <robin.krahl@ireas.org>
License: MIT
License: MIT
......
......@@ -2,12 +2,44 @@ Index: nitrokey/Cargo.toml
===================================================================
--- nitrokey.orig/Cargo.toml
+++ nitrokey/Cargo.toml
@@ -30,7 +30,7 @@ version = "0.2"
version = "3.4.1"
@@ -29,12 +29,8 @@ version = "0.2"
[dependencies.nitrokey-sys]
version = "3.4"
[dependencies.rand]
-version = "0.6"
-[dependencies.rand_core]
-version = "0.3"
-default-features = false
-
-[dependencies.rand_os]
-version = "0.1"
+[dependencies.rand]
+version = ">= 0.5"
[dev-dependencies.nitrokey-test]
version = "0.1"
[features]
test-pro = []
Index: nitrokey/src/util.rs
===================================================================
--- nitrokey.orig/src/util.rs
+++ nitrokey/src/util.rs
@@ -4,8 +4,8 @@ use std::fmt;
use std::os::raw::{c_char, c_int};
use libc::{c_void, free};
-use rand_core::RngCore;
-use rand_os::OsRng;
+use rand::RngCore;
+use rand::rngs::OsRng;
/// Error types returned by Nitrokey device or by the library.
#[derive(Clone, Copy, Debug, PartialEq)]
@@ -186,8 +186,8 @@ impl From<c_int> for CommandError {
}
}
-impl From<rand_core::Error> for CommandError {
- fn from(_error: rand_core::Error) -> Self {
+impl From<rand::Error> for CommandError {
+ fn from(_error: rand::Error) -> Self {
CommandError::RngError
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment