diff options
| author | Robin Krahl <robin.krahl@ireas.org> | 2020-09-25 02:09:18 +0200 |
|---|---|---|
| committer | Robin Krahl <robin.krahl@ireas.org> | 2020-10-02 11:54:41 +0200 |
| commit | c7c5e94f1e3d90e6ce85a7c6adb7fdbc31a29645 (patch) | |
| tree | ce36f73957b1504bb63c25282958aa06571302c5 /src | |
| parent | adbfa1c12257405112445497324938a011db8664 (diff) | |
| download | nitrocli-c7c5e94f1e3d90e6ce85a7c6adb7fdbc31a29645.tar.gz nitrocli-c7c5e94f1e3d90e6ce85a7c6adb7fdbc31a29645.tar.bz2 | |
Support Librem Key
This patch adds the librem device model for the Librem Key.
Note that we cannot run any tests for the new model until nitrokey-test
is updated.
Diffstat (limited to 'src')
| -rw-r--r-- | src/args.rs | 4 | ||||
| -rw-r--r-- | src/tests/mod.rs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/args.rs b/src/args.rs index e4bc77d..3bb1225 100644 --- a/src/args.rs +++ b/src/args.rs @@ -38,6 +38,7 @@ pub struct Args { Enum! { /// The available Nitrokey models. DeviceModel, [ + Librem => "librem", Pro => "pro", Storage => "storage", ] @@ -46,6 +47,7 @@ Enum! { impl DeviceModel { pub fn as_user_facing_str(&self) -> &str { match self { + DeviceModel::Librem => "Librem", DeviceModel::Pro => "Pro", DeviceModel::Storage => "Storage", } @@ -55,6 +57,7 @@ impl DeviceModel { impl From<DeviceModel> for nitrokey::Model { fn from(model: DeviceModel) -> nitrokey::Model { match model { + DeviceModel::Librem => nitrokey::Model::Librem, DeviceModel::Pro => nitrokey::Model::Pro, DeviceModel::Storage => nitrokey::Model::Storage, } @@ -66,6 +69,7 @@ impl convert::TryFrom<nitrokey::Model> for DeviceModel { fn try_from(model: nitrokey::Model) -> Result<DeviceModel, anyhow::Error> { match model { + nitrokey::Model::Librem => Ok(DeviceModel::Librem), nitrokey::Model::Pro => Ok(DeviceModel::Pro), nitrokey::Model::Storage => Ok(DeviceModel::Storage), _ => Err(anyhow::anyhow!("Unsupported device model: {}", model)), diff --git a/src/tests/mod.rs b/src/tests/mod.rs index 23eecc5..65983bb 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -76,6 +76,7 @@ impl Nitrocli { fn model_to_arg(model: nitrokey::Model) -> &'static str { match model { + nitrokey::Model::Librem => "--model=librem", nitrokey::Model::Pro => "--model=pro", nitrokey::Model::Storage => "--model=storage", _ => panic!("Unexpected model in test suite: {}", model), |