Revert "nitrokey - Restore changes for experimental and merge them with rand changes."

This reverts commit d1c4d5e2171923ba3ab09d99d30746009b9ced5d.

diff --git a/src/nitrokey/debian/changelog b/src/nitrokey/debian/changelog
index 86b139abcd8d46f8c7eeec2bdc1ffe3fbc88553a..9c268e1a247d9583e64a38d652331985ecd81611 100644 (file)
--- a/src/nitrokey/debian/changelog
+++ b/src/nitrokey/debian/changelog
@@ -1,16 +1,10 @@
-rust-nitrokey (0.4.0-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-nitrokey (0.3.4-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
   * Team upload.
-  * Package nitrokey 0.4.0 from crates.io using debcargo 2.5.0
+  * Package nitrokey 0.3.4 from crates.io using debcargo 2.5.0
   * Bump rand-core dependency to 0.6
 
- -- Peter Michael Green <plugwash@debian.org>  Sat, 29 Jan 2022 11:57:36 +0000
-
-rust-nitrokey (0.4.0-1) experimental; urgency=medium
-
-  * Package nitrokey 0.4.0 from crates.io using debcargo 2.4.1
-
- -- Robin Krahl <robin.krahl@ireas.org>  Wed, 15 Jan 2020 11:55:02 +0000
+ -- Peter Michael Green <plugwash@debian.org>  Sat, 29 Jan 2022 11:26:56 +0000
 
 rust-nitrokey (0.3.4-2) unstable; urgency=medium
 

diff --git a/src/nitrokey/debian/copyright b/src/nitrokey/debian/copyright
index e4bc3b8c7f2ed95413c0d4da93a0746d8ea6c147..9e5f408d10a5e13833f82f54ff87c12e44b65040 100644 (file)
--- a/src/nitrokey/debian/copyright
+++ b/src/nitrokey/debian/copyright
@@ -4,37 +4,13 @@ Upstream-Contact: Robin Krahl <robin.krahl@ireas.org>
 Source: https://git.ireas.org/nitrokey-rs/
 
 Files: *
-Copyright: 2018-2020 Robin Krahl <robin.krahl@ireas.org>
+Copyright: 2018 Robin Krahl <robin.krahl@ireas.org>
 License: MIT
 
-Files: ./.gitignore
-Copyright: 2019 Robin Krahl <robin.krahl@ireas.org>
-License: CC0-1.0
-
-Files: ./CHANGELOG.md
-Copyright: 2019-2020 Robin Krahl <robin.krahl@ireas.org>
-License: CC0-1.0
-
-Files: ./Cargo.toml
-Copyright: 2019-2020 Robin Krahl <robin.krahl@ireas.org>
-License: CC0-1.0
-
-Files: ./Cargo.toml.orig
-Copyright: 2019-2020 Robin Krahl <robin.krahl@ireas.org>
-License: CC0-1.0
-
-Files: ./README.md
-Copyright: 2019 Robin Krahl <robin.krahl@ireas.org>
-License: CC0-1.0
-
-Files: ./TODO.md
-Copyright: 2019 Robin Krahl <robin.krahl@ireas.org>
-License: CC0-1.0
-
 Files: debian/*
 Copyright:
- 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019-2020 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
@@ -55,7 +31,3 @@ License: MIT
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
-
-License: CC0-1.0
- Debian systems provide the CC0 1.0 Universal License in
- /usr/share/common-licenses/CC0-1.0

diff --git a/src/nitrokey/debian/copyright.debcargo.hint b/src/nitrokey/debian/copyright.debcargo.hint
index 191a9dccb21286812b476650a0beffd9a442ba1d..f51c84b8fa16e2df1cd0fcb7b027b3b3f21d6456 100644 (file)
--- a/src/nitrokey/debian/copyright.debcargo.hint
+++ b/src/nitrokey/debian/copyright.debcargo.hint
@@ -12,160 +12,13 @@ Comment:
  be correct information so you should review and fix this before uploading to
  the archive.
 
-Files: ./.gitignore
-Copyright: 2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./CHANGELOG.md
-Copyright: 2019-2020 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./Cargo.toml.orig
-Copyright: 2019-2020 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./LICENSES/MIT.txt
+Files: ./LICENSE
 Copyright: 2018 Robin Krahl <robin.krahl@ireas.org>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./README.md
-Copyright: 2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./TODO.md
-Copyright: 2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/auth.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/config.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/device/mod.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/device/pro.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/device/storage.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/device/wrapper.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/error.rs
-Copyright: 2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/lib.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/otp.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/pws.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/util.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/device.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/lib.rs
-Copyright: 2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/otp.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/pws.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/util/mod.rs
-Copyright: 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
 Files: debian/*
 Copyright:
  2019-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>

diff --git a/src/nitrokey/debian/patches/rand-core-0.5.patch b/src/nitrokey/debian/patches/rand-core-0.5.patch
new file mode 100644 (file)
index 0000000..d99d204
--- /dev/null
+++ b/src/nitrokey/debian/patches/rand-core-0.5.patch
@@ -0,0 +1,23 @@
+--- a/src/util.rs
++++ b/src/util.rs
+@@ -4,8 +4,7 @@
+ use std::os::raw::{c_char, c_int};
+ 
+ use libc::{c_void, free};
+-use rand_core::RngCore;
+-use rand_os::OsRng;
++use rand_core::{RngCore, OsRng};
+ 
+ /// Error types returned by Nitrokey device or by the library.
+ #[derive(Clone, Copy, Debug, PartialEq)]
+@@ -113,9 +112,8 @@
+ }
+ 
+ pub fn generate_password(length: usize) -> Result<Vec<u8>, CommandError> {
+-    let mut rng = OsRng::new()?;
+     let mut data = vec![0u8; length];
+-    rng.fill_bytes(&mut data[..]);
++    OsRng.fill_bytes(&mut data[..]);
+     Ok(data)
+ }
+ 

diff --git a/src/nitrokey/debian/patches/relax-dep-versions.patch b/src/nitrokey/debian/patches/relax-dep-versions.patch
index bc2a47061a497ae66f22d8940287b0181f73f0f2..5a055b83a6488289d8f1dd0e17468cd0a07245bf 100644 (file)
--- a/src/nitrokey/debian/patches/relax-dep-versions.patch
+++ b/src/nitrokey/debian/patches/relax-dep-versions.patch
@@ -1,7 +1,16 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -36,3 +36,3 @@
+@@ -30,11 +30,9 @@
+ version = "3.4"
+ 
  [dependencies.rand_core]
--version = "0.5.1"
+-version = "0.3"
+-default-features = false
 +version = "0.6"
- features = ["getrandom"]
++features = ["getrandom"]
+ 
+-[dependencies.rand_os]
+-version = "0.1"
+ [dev-dependencies.nitrokey-test]
+ version = "0.1"
+ 

diff --git a/src/nitrokey/debian/patches/series b/src/nitrokey/debian/patches/series
index 3997fc337e7ad01016a06ab5a3ae9a156b539d4b..c21e3027d1a590893bd8fa01a1c13426f3dd71f2 100644 (file)
--- a/src/nitrokey/debian/patches/series
+++ b/src/nitrokey/debian/patches/series
@@ -1 +1,2 @@
 relax-dep-versions.patch
+rand-core-0.5.patch