diff options
author | Nora Widdecke <nora@sequoia-pgp.org> | 2022-08-25 22:24:17 +0200 |
---|---|---|
committer | Nora Widdecke <nora@sequoia-pgp.org> | 2022-09-07 16:07:54 +0200 |
commit | 9667e62a21689e16468157ca22a75988359acd01 (patch) | |
tree | d1d955d65520a227fb539fbb334baf47e2e64797 /sq | |
parent | 02c051b6b37e010c2db9a1b86e514918b617b9da (diff) |
sq: Clean up openpgp imports.
- We 'use sequoia_openpgp as openpgp' in sq.rs. That allows members
referencing it as crate::openpgp. This is highly confusing, as
openpgp is not actually part of this crate.
- Fix the confusion by explicitly importing sequoia_openpgp.
Diffstat (limited to 'sq')
-rw-r--r-- | sq/src/commands/decrypt.rs | 16 | ||||
-rw-r--r-- | sq/src/commands/inspect.rs | 14 | ||||
-rw-r--r-- | sq/src/commands/key.rs | 27 | ||||
-rw-r--r-- | sq/src/commands/merge_signatures.rs | 12 | ||||
-rw-r--r-- | sq/src/commands/mod.rs | 24 | ||||
-rw-r--r-- | sq/src/commands/sign.rs | 16 | ||||
-rw-r--r-- | sq/src/sq.rs | 18 |
7 files changed, 64 insertions, 63 deletions
diff --git a/sq/src/commands/decrypt.rs b/sq/src/commands/decrypt.rs index 9a701917..bdac7377 100644 --- a/sq/src/commands/decrypt.rs +++ b/sq/src/commands/decrypt.rs @@ -4,18 +4,18 @@ use std::io; use sequoia_net::pks; use sequoia_openpgp as openpgp; -use crate::openpgp::types::SymmetricAlgorithm; -use crate::openpgp::fmt::hex; -use crate::openpgp::crypto::{self, SessionKey, Decryptor, Password}; -use crate::openpgp::{Fingerprint, Cert, KeyID, Result}; -use crate::openpgp::packet; -use crate::openpgp::packet::prelude::*; -use crate::openpgp::parse::{ +use openpgp::types::SymmetricAlgorithm; +use openpgp::fmt::hex; +use openpgp::crypto::{self, SessionKey, Decryptor, Password}; +use openpgp::{Fingerprint, Cert, KeyID, Result}; +use openpgp::packet; +use openpgp::packet::prelude::*; +use openpgp::parse::{ Parse, PacketParser, PacketParserResult, }; -use crate::openpgp::parse::stream::{ +use openpgp::parse::stream::{ VerificationHelper, DecryptionHelper, DecryptorBuilder, MessageStructure, }; diff --git a/sq/src/commands/inspect.rs b/sq/src/commands/inspect.rs index ca10e6ef..6da46a9d 100644 --- a/sq/src/commands/inspect.rs +++ b/sq/src/commands/inspect.rs @@ -2,15 +2,15 @@ use std::convert::TryFrom; use std::io::{self, Read}; use sequoia_openpgp as openpgp; -use crate::openpgp::{KeyHandle, Packet, Result}; -use crate::openpgp::cert::prelude::*; +use openpgp::{KeyHandle, Packet, Result}; +use openpgp::cert::prelude::*; use openpgp::packet::{ Signature, key::PublicParts, }; -use crate::openpgp::parse::{Parse, PacketParserResult}; -use crate::openpgp::policy::{Policy, HashAlgoSecurity}; -use crate::openpgp::packet::key::SecretKeyMaterial; +use openpgp::parse::{Parse, PacketParserResult}; +use openpgp::policy::{Policy, HashAlgoSecurity}; +use openpgp::packet::key::SecretKeyMaterial; use super::dump::Convert; @@ -285,7 +285,7 @@ fn inspect_revocation(output: &mut dyn io::Write, indent: &str, revoked: openpgp::types::RevocationStatus) -> Result<()> { - use crate::openpgp::types::RevocationStatus::*; + use openpgp::types::RevocationStatus::*; fn print_reasons(output: &mut dyn io::Write, indent: &str, third_party: bool, sigs: &[&Signature]) -> Result<()> { @@ -371,7 +371,7 @@ fn inspect_key_flags(flags: openpgp::types::KeyFlags) -> Option<String> { fn inspect_signatures(output: &mut dyn io::Write, sigs: &[openpgp::packet::Signature]) -> Result<()> { - use crate::openpgp::types::SignatureType::*; + use openpgp::types::SignatureType::*; for sig in sigs { match sig.typ() { Binary | Text => (), diff --git a/sq/src/commands/key.rs b/sq/src/commands/key.rs index 2be2a0f7..f2062f3a 100644 --- a/sq/src/commands/key.rs +++ b/sq/src/commands/key.rs @@ -2,18 +2,19 @@ use anyhow::Context as _; use itertools::Itertools; use std::time::{SystemTime, Duration}; -use crate::openpgp::KeyHandle; -use crate::openpgp::Packet; -use crate::openpgp::Result; -use crate::openpgp::armor::{Writer, Kind}; -use crate::openpgp::cert::prelude::*; -use crate::openpgp::packet::prelude::*; -use crate::openpgp::packet::signature::subpacket::SubpacketTag; -use crate::openpgp::parse::Parse; -use crate::openpgp::policy::{Policy, HashAlgoSecurity}; -use crate::openpgp::serialize::Serialize; -use crate::openpgp::types::KeyFlags; -use crate::openpgp::types::SignatureType; +use sequoia_openpgp as openpgp; +use openpgp::KeyHandle; +use openpgp::Packet; +use openpgp::Result; +use openpgp::armor::{Writer, Kind}; +use openpgp::cert::prelude::*; +use openpgp::packet::prelude::*; +use openpgp::packet::signature::subpacket::SubpacketTag; +use openpgp::parse::Parse; +use openpgp::policy::{Policy, HashAlgoSecurity}; +use openpgp::serialize::Serialize; +use openpgp::types::KeyFlags; +use openpgp::types::SignatureType; use crate::{ open_or_stdin, @@ -533,7 +534,7 @@ fn adopt(config: Config, command: sq_cli::key::AdoptCommand) -> Result<()> { wanted.push((h, None)); } - let null_policy = &crate::openpgp::policy::NullPolicy::new(); + let null_policy = &openpgp::policy::NullPolicy::new(); let adoptee_policy: &dyn Policy = if command.allow_broken_crypto { null_policy diff --git a/sq/src/commands/merge_signatures.rs b/sq/src/commands/merge_signatures.rs index 63741daa..e82747e7 100644 --- a/sq/src/commands/merge_signatures.rs +++ b/sq/src/commands/merge_signatures.rs @@ -2,12 +2,12 @@ use anyhow::Context as _; use std::io; extern crate sequoia_openpgp as openpgp; -use crate::openpgp::packet::Literal; -use crate::openpgp::packet::Tag; -use crate::openpgp::parse::{PacketParser, PacketParserResult, Parse}; -use crate::openpgp::serialize::stream::{LiteralWriter, Message}; -use crate::openpgp::serialize::Serialize; -use crate::openpgp::{Packet, Result}; +use openpgp::packet::Literal; +use openpgp::packet::Tag; +use openpgp::parse::{PacketParser, PacketParserResult, Parse}; +use openpgp::serialize::stream::{LiteralWriter, Message}; +use openpgp::serialize::Serialize; +use openpgp::{Packet, Result}; pub fn merge_signatures( input1: &mut (dyn io::Read + Send + Sync), diff --git a/sq/src/commands/mod.rs b/sq/src/commands/mod.rs index 5a82a61f..a7444391 100644 --- a/sq/src/commands/mod.rs +++ b/sq/src/commands/mod.rs @@ -8,29 +8,29 @@ use std::time::SystemTime; use sequoia_net::pks; use sequoia_openpgp as openpgp; -use crate::openpgp::{ +use openpgp::{ armor, }; -use crate::openpgp::types::{ +use openpgp::types::{ CompressionAlgorithm, }; -use crate::openpgp::cert::prelude::*; -use crate::openpgp::crypto; -use crate::openpgp::{Cert, KeyID, Result}; -use crate::openpgp::packet::prelude::*; -use crate::openpgp::parse::{ +use openpgp::cert::prelude::*; +use openpgp::crypto; +use openpgp::{Cert, KeyID, Result}; +use openpgp::packet::prelude::*; +use openpgp::parse::{ Parse, PacketParserResult, }; -use crate::openpgp::parse::stream::*; -use crate::openpgp::serialize::stream::{ +use openpgp::parse::stream::*; +use openpgp::serialize::stream::{ Message, Signer, LiteralWriter, Encryptor, Recipient, Compressor, padding::Padder, }; -use crate::openpgp::policy::Policy; -use crate::openpgp::types::KeyFlags; -use crate::openpgp::types::RevocationStatus; +use openpgp::policy::Policy; +use openpgp::types::KeyFlags; +use openpgp::types::RevocationStatus; use crate::{ Config, diff --git a/sq/src/commands/sign.rs b/sq/src/commands/sign.rs index 4a6a10ab..5c0daf70 100644 --- a/sq/src/commands/sign.rs +++ b/sq/src/commands/sign.rs @@ -6,19 +6,19 @@ use std::time::SystemTime; use tempfile::NamedTempFile; use sequoia_openpgp as openpgp; -use crate::openpgp::armor; -use crate::openpgp::{Packet, Result}; -use crate::openpgp::packet::prelude::*; -use crate::openpgp::packet::signature::subpacket::NotationData; -use crate::openpgp::parse::{ +use openpgp::armor; +use openpgp::{Packet, Result}; +use openpgp::packet::prelude::*; +use openpgp::packet::signature::subpacket::NotationData; +use openpgp::parse::{ Parse, PacketParserResult, }; -use crate::openpgp::serialize::Serialize; -use crate::openpgp::serialize::stream::{ +use openpgp::serialize::Serialize; +use openpgp::serialize::stream::{ Message, Armorer, Signer, LiteralWriter, }; -use crate::openpgp::types::SignatureType; +use openpgp::types::SignatureType; use crate::{ Config, }; diff --git a/sq/src/sq.rs b/sq/src/sq.rs index db0a0c79..0b8d7cd7 100644 --- a/sq/src/sq.rs +++ b/sq/src/sq.rs @@ -18,15 +18,15 @@ use sequoia_openpgp as openpgp; use openpgp::{ Result, }; -use crate::openpgp::{armor, Cert}; -use crate::openpgp::crypto::Password; -use crate::openpgp::packet::prelude::*; -use crate::openpgp::parse::{Parse, PacketParser, PacketParserResult}; -use crate::openpgp::packet::signature::subpacket::NotationData; -use crate::openpgp::packet::signature::subpacket::NotationDataFlags; -use crate::openpgp::serialize::{Serialize, stream::{Message, Armorer}}; -use crate::openpgp::cert::prelude::*; -use crate::openpgp::policy::StandardPolicy as P; +use openpgp::{armor, Cert}; +use openpgp::crypto::Password; +use openpgp::packet::prelude::*; +use openpgp::parse::{Parse, PacketParser, PacketParserResult}; +use openpgp::packet::signature::subpacket::NotationData; +use openpgp::packet::signature::subpacket::NotationDataFlags; +use openpgp::serialize::{Serialize, stream::{Message, Armorer}}; +use openpgp::cert::prelude::*; +use openpgp::policy::StandardPolicy as P; use clap::FromArgMatches; use crate::sq_cli::packet; |