From d0d9683df8398696147e7ee1fcffb2e4e957008c Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
Date: Sat, 4 Apr 2020 14:39:19 -0700
Subject: Remove vendored dependencies

While it appears that by now we actually can get successful builds
without Cargo insisting on Internet access by virtue of using the
--frozen flag, maintaining vendored dependencies is somewhat of a pain
point. This state will also get worse with upcoming changes that replace
argparse in favor of structopt and pull in a slew of new dependencies by
doing so. Then there is also the repository structure aspect, which is
non-standard due to the way we vendor dependencies and a potential
source of confusion.
In order to fix these problems, this change removes all the vendored
dependencies we have.

Delete subrepo argparse/:argparse
Delete subrepo base32/:base32
Delete subrepo cc/:cc
Delete subrepo cfg-if/:cfg-if
Delete subrepo getrandom/:getrandom
Delete subrepo lazy-static/:lazy-static
Delete subrepo libc/:libc
Delete subrepo nitrokey-sys/:nitrokey-sys
Delete subrepo nitrokey/:nitrokey
Delete subrepo rand/:rand
---
 nitrokey/src/config.rs | 106 -------------------------------------------------
 1 file changed, 106 deletions(-)
 delete mode 100644 nitrokey/src/config.rs

(limited to 'nitrokey/src/config.rs')

diff --git a/nitrokey/src/config.rs b/nitrokey/src/config.rs
deleted file mode 100644
index cb678d7..0000000
--- a/nitrokey/src/config.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (C) 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-// SPDX-License-Identifier: MIT
-
-use std::convert;
-
-use crate::error::{Error, LibraryError};
-
-/// The configuration for a Nitrokey.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Config {
-    /// If set, the stick will generate a code from the HOTP slot with the given number if numlock
-    /// is pressed.  The slot number must be 0, 1 or 2.
-    pub numlock: Option<u8>,
-    /// If set, the stick will generate a code from the HOTP slot with the given number if capslock
-    /// is pressed.  The slot number must be 0, 1 or 2.
-    pub capslock: Option<u8>,
-    /// If set, the stick will generate a code from the HOTP slot with the given number if
-    /// scrollock is pressed.  The slot number must be 0, 1 or 2.
-    pub scrollock: Option<u8>,
-    /// If set, OTP generation using [`get_hotp_code`][] or [`get_totp_code`][] requires user
-    /// authentication.  Otherwise, OTPs can be generated without authentication.
-    ///
-    /// [`get_hotp_code`]: trait.ProvideOtp.html#method.get_hotp_code
-    /// [`get_totp_code`]: trait.ProvideOtp.html#method.get_totp_code
-    pub user_password: bool,
-}
-
-#[derive(Debug)]
-pub struct RawConfig {
-    pub numlock: u8,
-    pub capslock: u8,
-    pub scrollock: u8,
-    pub user_password: bool,
-}
-
-fn config_otp_slot_to_option(value: u8) -> Option<u8> {
-    if value < 3 {
-        Some(value)
-    } else {
-        None
-    }
-}
-
-fn option_to_config_otp_slot(value: Option<u8>) -> Result<u8, Error> {
-    if let Some(value) = value {
-        if value < 3 {
-            Ok(value)
-        } else {
-            Err(LibraryError::InvalidSlot.into())
-        }
-    } else {
-        Ok(255)
-    }
-}
-
-impl Config {
-    /// Constructs a new instance of this struct.
-    pub fn new(
-        numlock: Option<u8>,
-        capslock: Option<u8>,
-        scrollock: Option<u8>,
-        user_password: bool,
-    ) -> Config {
-        Config {
-            numlock,
-            capslock,
-            scrollock,
-            user_password,
-        }
-    }
-}
-
-impl convert::TryFrom<Config> for RawConfig {
-    type Error = Error;
-
-    fn try_from(config: Config) -> Result<RawConfig, Error> {
-        Ok(RawConfig {
-            numlock: option_to_config_otp_slot(config.numlock)?,
-            capslock: option_to_config_otp_slot(config.capslock)?,
-            scrollock: option_to_config_otp_slot(config.scrollock)?,
-            user_password: config.user_password,
-        })
-    }
-}
-
-impl From<[u8; 5]> for RawConfig {
-    fn from(data: [u8; 5]) -> Self {
-        RawConfig {
-            numlock: data[0],
-            capslock: data[1],
-            scrollock: data[2],
-            user_password: data[3] != 0,
-        }
-    }
-}
-
-impl Into<Config> for RawConfig {
-    fn into(self) -> Config {
-        Config {
-            numlock: config_otp_slot_to_option(self.numlock),
-            capslock: config_otp_slot_to_option(self.capslock),
-            scrollock: config_otp_slot_to_option(self.scrollock),
-            user_password: self.user_password,
-        }
-    }
-}
-- 
cgit v1.2.1