chore: reorder use
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
|
use std::ops::Deref;
|
||||||
use clap::{ArgMatches, SubCommand, App, Arg};
|
use clap::{ArgMatches, SubCommand, App, Arg};
|
||||||
use yubico_manager::Yubico;
|
use yubico_manager::Yubico;
|
||||||
use yubico_manager::config::{Config, Mode, Slot};
|
use yubico_manager::config::{Config, Mode, Slot};
|
||||||
use std::ops::Deref;
|
|
||||||
use rust_util::util_clap::{Command, CommandError};
|
use rust_util::util_clap::{Command, CommandError};
|
||||||
|
|
||||||
pub struct CommandImpl;
|
pub struct CommandImpl;
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::thread;
|
use std::thread;
|
||||||
use std::sync::mpsc::{channel, Sender};
|
use std::sync::mpsc::{channel, Sender};
|
||||||
|
use rand::Rng;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use authenticator::{StatusUpdate, RegisterResult};
|
use authenticator::{StatusUpdate, RegisterResult};
|
||||||
use base64::URL_SAFE_NO_PAD;
|
use base64::URL_SAFE_NO_PAD;
|
||||||
use rand::Rng;
|
|
||||||
use rust_util::XResult;
|
use rust_util::XResult;
|
||||||
|
|
||||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate rust_util;
|
extern crate rust_util;
|
||||||
|
|
||||||
// mod cmd;
|
|
||||||
mod fido;
|
mod fido;
|
||||||
mod digest;
|
mod digest;
|
||||||
mod register;
|
mod register;
|
||||||
|
|||||||
12
src/pgp.rs
12
src/pgp.rs
@@ -1,13 +1,13 @@
|
|||||||
|
use pem::Pem;
|
||||||
use clap::{ArgMatches, SubCommand, App, Arg};
|
use clap::{ArgMatches, SubCommand, App, Arg};
|
||||||
use sequoia_openpgp::parse::Parse;
|
|
||||||
use sequoia_openpgp::parse::{PacketParser, PacketParserResult};
|
|
||||||
use sequoia_openpgp::Packet;
|
|
||||||
use sequoia_openpgp::packet::{Key, Signature};
|
|
||||||
use chrono::{DateTime, Local};
|
use chrono::{DateTime, Local};
|
||||||
use openssl::rsa::Rsa;
|
use openssl::rsa::Rsa;
|
||||||
use sequoia_openpgp::crypto::mpi::PublicKey;
|
|
||||||
use openssl::bn::BigNum;
|
use openssl::bn::BigNum;
|
||||||
use pem::Pem;
|
use sequoia_openpgp::Packet;
|
||||||
|
use sequoia_openpgp::parse::Parse;
|
||||||
|
use sequoia_openpgp::packet::{Key, Signature};
|
||||||
|
use sequoia_openpgp::crypto::mpi::PublicKey;
|
||||||
|
use sequoia_openpgp::parse::{PacketParser, PacketParserResult};
|
||||||
use sequoia_openpgp::packet::signature::subpacket::SubpacketTag;
|
use sequoia_openpgp::packet::signature::subpacket::SubpacketTag;
|
||||||
use rust_util::util_clap::{Command, CommandError};
|
use rust_util::util_clap::{Command, CommandError};
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
use std::collections::BTreeMap;
|
||||||
use clap::{ArgMatches, SubCommand, App, Arg};
|
use clap::{ArgMatches, SubCommand, App, Arg};
|
||||||
use openpgp_card::DecryptMe;
|
use openpgp_card::DecryptMe;
|
||||||
use std::collections::BTreeMap;
|
|
||||||
use rust_util::util_clap::{Command, CommandError};
|
use rust_util::util_clap::{Command, CommandError};
|
||||||
|
|
||||||
pub struct CommandImpl;
|
pub struct CommandImpl;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
use std::collections::BTreeMap;
|
||||||
use clap::{ArgMatches, SubCommand, App, Arg};
|
use clap::{ArgMatches, SubCommand, App, Arg};
|
||||||
use openpgp_card::{OpenPGPCard, DecryptMe, Hash, KeyType};
|
use openpgp_card::{OpenPGPCard, DecryptMe, Hash, KeyType};
|
||||||
use std::collections::BTreeMap;
|
|
||||||
use rust_util::util_clap::{Command, CommandError};
|
use rust_util::util_clap::{Command, CommandError};
|
||||||
|
|
||||||
pub struct CommandImpl;
|
pub struct CommandImpl;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
|
use std::collections::BTreeMap;
|
||||||
use clap::{ArgMatches, SubCommand, App, Arg};
|
use clap::{ArgMatches, SubCommand, App, Arg};
|
||||||
use openpgp_card::Hash;
|
use openpgp_card::Hash;
|
||||||
use rust_util::XResult;
|
use rust_util::XResult;
|
||||||
use std::collections::BTreeMap;
|
|
||||||
use rust_util::util_clap::{Command, CommandError};
|
use rust_util::util_clap::{Command, CommandError};
|
||||||
|
|
||||||
pub struct CommandImpl;
|
pub struct CommandImpl;
|
||||||
|
|||||||
10
src/piv.rs
10
src/piv.rs
@@ -1,14 +1,14 @@
|
|||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
use pem::Pem;
|
||||||
|
use sha2::Sha256;
|
||||||
|
use digest::Digest;
|
||||||
|
use chrono::Local;
|
||||||
use clap::{ArgMatches, SubCommand, App, Arg};
|
use clap::{ArgMatches, SubCommand, App, Arg};
|
||||||
use yubikey::{YubiKey, Certificate};
|
use yubikey::{YubiKey, Certificate};
|
||||||
use yubikey::piv::SlotId;
|
use yubikey::piv::SlotId;
|
||||||
use rust_util::XResult;
|
|
||||||
use sha2::Sha256;
|
|
||||||
use x509_parser::parse_x509_certificate;
|
use x509_parser::parse_x509_certificate;
|
||||||
use pem::Pem;
|
use rust_util::XResult;
|
||||||
use digest::Digest;
|
|
||||||
use rust_util::util_msg::MessageType;
|
use rust_util::util_msg::MessageType;
|
||||||
use chrono::Local;
|
|
||||||
use rust_util::util_clap::{Command, CommandError};
|
use rust_util::util_clap::{Command, CommandError};
|
||||||
|
|
||||||
pub struct CommandImpl;
|
pub struct CommandImpl;
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
|
use std::sync::mpsc::channel;
|
||||||
use clap::{ArgMatches, SubCommand, App, Arg};
|
use clap::{ArgMatches, SubCommand, App, Arg};
|
||||||
use authenticator::authenticatorservice::AuthenticatorService;
|
use authenticator::authenticatorservice::AuthenticatorService;
|
||||||
use authenticator::statecallback::StateCallback;
|
use authenticator::statecallback::StateCallback;
|
||||||
use authenticator::RegisterFlags;
|
use authenticator::RegisterFlags;
|
||||||
use std::sync::mpsc::channel;
|
use rust_util::util_clap::{Command, CommandError};
|
||||||
use crate::fido;
|
use crate::fido;
|
||||||
use crate::digest;
|
use crate::digest;
|
||||||
use crate::fido::{U2fV2Challenge, U2fRegistrationData};
|
use crate::fido::{U2fV2Challenge, U2fRegistrationData};
|
||||||
use rust_util::util_clap::{Command, CommandError};
|
|
||||||
|
|
||||||
pub struct CommandImpl;
|
pub struct CommandImpl;
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
|
use std::sync::mpsc::channel;
|
||||||
use clap::{ArgMatches, SubCommand, App, Arg};
|
use clap::{ArgMatches, SubCommand, App, Arg};
|
||||||
use authenticator::{KeyHandle, AuthenticatorTransports, SignFlags};
|
use authenticator::{KeyHandle, AuthenticatorTransports, SignFlags};
|
||||||
use std::sync::mpsc::channel;
|
|
||||||
use authenticator::statecallback::StateCallback;
|
use authenticator::statecallback::StateCallback;
|
||||||
use authenticator::authenticatorservice::AuthenticatorService;
|
use authenticator::authenticatorservice::AuthenticatorService;
|
||||||
|
use rust_util::util_clap::{Command, CommandError};
|
||||||
use crate::fido;
|
use crate::fido;
|
||||||
use crate::digest;
|
use crate::digest;
|
||||||
use crate::fido::U2fV2Challenge;
|
use crate::fido::U2fV2Challenge;
|
||||||
use rust_util::util_clap::{Command, CommandError};
|
|
||||||
|
|
||||||
pub struct CommandImpl;
|
pub struct CommandImpl;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user