diff options
| author | Robin Krahl <robin.krahl@ireas.org> | 2019-07-17 20:53:58 -0700 |
|---|---|---|
| committer | Daniel Mueller <deso@posteo.net> | 2019-12-16 19:51:49 -0800 |
| commit | a18066a1a10792ddbd57527ad58f75fc84fafad2 (patch) | |
| tree | 74f22ae039a0d02cb8b27366ede967b267461c9a /nitrocli/src/tests/mod.rs | |
| parent | cc4a29c3b7662f74d6dfab42ff2b6f303252256f (diff) | |
| download | nitrocli-a18066a1a10792ddbd57527ad58f75fc84fafad2.tar.gz nitrocli-a18066a1a10792ddbd57527ad58f75fc84fafad2.tar.bz2 | |
Use nitrokey::DEFAULT_{ADMIN,USER}_PIN constants
Since version 0.4.0, nitrokey provides the default admin and user PIN as
constants. This patch removes the constants from nitrocli and uses
nitrokey's constant instead.
Diffstat (limited to 'nitrocli/src/tests/mod.rs')
| -rw-r--r-- | nitrocli/src/tests/mod.rs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/nitrocli/src/tests/mod.rs b/nitrocli/src/tests/mod.rs index c2b51c2..e8af624 100644 --- a/nitrocli/src/tests/mod.rs +++ b/nitrocli/src/tests/mod.rs @@ -22,11 +22,6 @@ use std::fmt; use nitrokey_test::test as test_device; -// TODO: Those defines should potentially be taken from the `nitrokey` -// crate, once exported. -const NITROKEY_DEFAULT_ADMIN_PIN: &str = "12345678"; -const NITROKEY_DEFAULT_USER_PIN: &str = "123456"; - mod config; mod encrypted; mod hidden; @@ -94,8 +89,8 @@ impl Nitrocli { pub fn new() -> Self { Self { model: None, - admin_pin: Some(NITROKEY_DEFAULT_ADMIN_PIN.into()), - user_pin: Some(NITROKEY_DEFAULT_USER_PIN.into()), + admin_pin: Some(nitrokey::DEFAULT_ADMIN_PIN.into()), + user_pin: Some(nitrokey::DEFAULT_USER_PIN.into()), new_admin_pin: None, new_user_pin: None, password: None, @@ -108,8 +103,8 @@ impl Nitrocli { { let result = Self { model: Some(device.get_model()), - admin_pin: Some(NITROKEY_DEFAULT_ADMIN_PIN.into()), - user_pin: Some(NITROKEY_DEFAULT_USER_PIN.into()), + admin_pin: Some(nitrokey::DEFAULT_ADMIN_PIN.into()), + user_pin: Some(nitrokey::DEFAULT_USER_PIN.into()), new_admin_pin: None, new_user_pin: None, password: Some("1234567".into()), |