diff options
Diffstat (limited to 'nitrocli/src')
-rw-r--r-- | nitrocli/src/args.rs | 5 | ||||
-rw-r--r-- | nitrocli/src/commands.rs | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/nitrocli/src/args.rs b/nitrocli/src/args.rs index b109944..b5d4e81 100644 --- a/nitrocli/src/args.rs +++ b/nitrocli/src/args.rs @@ -327,6 +327,7 @@ impl From<OtpMode> for nitrokey::OtpMode { #[derive(Clone, Copy, Debug, PartialEq)] pub enum OtpSecretFormat { Ascii, + Base32, Hex, } @@ -337,6 +338,7 @@ impl fmt::Display for OtpSecretFormat { "{}", match *self { OtpSecretFormat::Ascii => "ascii", + OtpSecretFormat::Base32 => "base32", OtpSecretFormat::Hex => "hex", } ) @@ -349,6 +351,7 @@ impl str::FromStr for OtpSecretFormat { fn from_str(s: &str) -> result::Result<Self, Self::Err> { match s { "ascii" => Ok(OtpSecretFormat::Ascii), + "base32" => Ok(OtpSecretFormat::Base32), "hex" => Ok(OtpSecretFormat::Hex), _ => Err(()), } @@ -777,7 +780,7 @@ pub fn otp_set(ctx: &ExecCtx, args: Vec<String>) -> Result<()> { let _ = parser.refer(&mut secret_format).add_option( &["-f", "--format"], argparse::StoreOption, - "The format of the secret (ascii|hex)", + "The format of the secret (ascii|base32|hex)", ); parse(&parser, args)?; drop(parser); diff --git a/nitrocli/src/commands.rs b/nitrocli/src/commands.rs index 71b2bdd..289c257 100644 --- a/nitrocli/src/commands.rs +++ b/nitrocli/src/commands.rs @@ -457,6 +457,13 @@ fn prepare_ascii_secret(secret: &str) -> Result<String> { } } +/// Prepare a base32 secret string for libnitrokey. +fn prepare_base32_secret(secret: &str) -> Result<String> { + base32::decode(base32::Alphabet::RFC4648 { padding: false }, secret) + .map(|vec| format_bytes(&vec)) + .ok_or_else(|| Error::Error("Could not parse base32 secret".to_string())) +} + /// Configure a one-time password slot on the Nitrokey device. pub fn otp_set( ctx: &args::ExecCtx, @@ -468,6 +475,7 @@ pub fn otp_set( ) -> Result<()> { let secret = match secret_format { args::OtpSecretFormat::Ascii => prepare_ascii_secret(&data.secret)?, + args::OtpSecretFormat::Base32 => prepare_base32_secret(&data.secret)?, args::OtpSecretFormat::Hex => data.secret, }; let data = nitrokey::OtpSlotData { secret, ..data }; |