diff options
Diffstat (limited to 'tool/src')
-rw-r--r-- | tool/src/commands/inspect.rs | 2 | ||||
-rw-r--r-- | tool/src/commands/key.rs | 2 | ||||
-rw-r--r-- | tool/src/commands/mod.rs | 2 | ||||
-rw-r--r-- | tool/src/sq.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs index 6d423239..e7372f11 100644 --- a/tool/src/commands/inspect.rs +++ b/tool/src/commands/inspect.rs @@ -4,7 +4,7 @@ use clap; extern crate sequoia_openpgp as openpgp; use crate::openpgp::{Packet, Result}; -use crate::openpgp::cert::components::{Amalgamation, ValidAmalgamation}; +use crate::openpgp::cert::prelude::*; use openpgp::packet::key::PublicParts; use crate::openpgp::parse::{Parse, PacketParserResult}; use crate::openpgp::policy::Policy; diff --git a/tool/src/commands/key.rs b/tool/src/commands/key.rs index afca59f1..b463214e 100644 --- a/tool/src/commands/key.rs +++ b/tool/src/commands/key.rs @@ -5,7 +5,7 @@ use itertools::Itertools; use std::time::{SystemTime, Duration}; use crate::openpgp::Packet; -use crate::openpgp::cert::{CertBuilder, CipherSuite}; +use crate::openpgp::cert::prelude::*; use crate::openpgp::types::KeyFlags; use crate::openpgp::armor::{Writer, Kind}; use crate::openpgp::serialize::Serialize; diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs index dfb1dfdd..a925d362 100644 --- a/tool/src/commands/mod.rs +++ b/tool/src/commands/mod.rs @@ -11,9 +11,9 @@ use sequoia_core::Context; use crate::openpgp::types::{ CompressionAlgorithm, }; +use crate::openpgp::cert::prelude::*; use crate::openpgp::crypto; use crate::openpgp::{Cert, KeyID, Result}; -use crate::openpgp::cert::components::Amalgamation; use crate::openpgp::packet::prelude::*; use crate::openpgp::parse::{ Parse, diff --git a/tool/src/sq.rs b/tool/src/sq.rs index 2161592f..10b3f33d 100644 --- a/tool/src/sq.rs +++ b/tool/src/sq.rs @@ -31,7 +31,7 @@ use crate::openpgp::fmt::hex; use crate::openpgp::types::KeyFlags; use crate::openpgp::parse::Parse; use crate::openpgp::serialize::Serialize; -use crate::openpgp::cert::CertParser; +use crate::openpgp::cert::prelude::*; use crate::openpgp::policy::StandardPolicy as P; use sequoia_core::{Context, NetworkPolicy}; use sequoia_net::{KeyServer, wkd}; |