diff options
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | sq/Cargo.toml | 1 | ||||
| -rw-r--r-- | sq/src/commands/inspect.rs | 17 | ||||
| -rw-r--r-- | sq/src/sq-usage.rs | 1 | ||||
| -rw-r--r-- | sq/src/sq_cli.rs | 3 |
5 files changed, 5 insertions, 18 deletions
@@ -1977,7 +1977,6 @@ dependencies = [ "predicates", "rpassword", "sequoia-autocrypt", - "sequoia-ipc", "sequoia-net", "sequoia-openpgp", "tempfile", diff --git a/sq/Cargo.toml b/sq/Cargo.toml index e12e8786..7c347482 100644 --- a/sq/Cargo.toml +++ b/sq/Cargo.toml @@ -25,7 +25,6 @@ maintenance = { status = "actively-developed" } buffered-reader = { path = "../buffered-reader", version = "1.0.0", default-features = false } sequoia-openpgp = { path = "../openpgp", version = "1.0.0", default-features = false } sequoia-autocrypt = { path = "../autocrypt", version = "0.22", default-features = false } -sequoia-ipc = { path = "../ipc", version = "0.22", default-features = false } sequoia-net = { path = "../net", version = "0.22", default-features = false, optional = true } anyhow = "1.0.18" chrono = "0.4.10" diff --git a/sq/src/commands/inspect.rs b/sq/src/commands/inspect.rs index 53d7c8e5..37463470 100644 --- a/sq/src/commands/inspect.rs +++ b/sq/src/commands/inspect.rs @@ -18,7 +18,6 @@ use super::dump::Convert; pub fn inspect(m: &clap::ArgMatches, policy: &dyn Policy, output: &mut dyn io::Write) -> Result<()> { - let print_keygrips = m.is_present("keygrips"); let print_certifications = m.is_present("certifications"); let input = m.value_of("input"); @@ -49,7 +48,7 @@ pub fn inspect(m: &clap::ArgMatches, policy: &dyn Policy, output: &mut dyn io::W let pp = openpgp::PacketPile::from( ::std::mem::replace(&mut packets, Vec::new())); let cert = openpgp::Cert::try_from(pp)?; - inspect_cert(policy, output, &cert, print_keygrips, + inspect_cert(policy, output, &cert, print_certifications)?; } }, @@ -109,7 +108,7 @@ pub fn inspect(m: &clap::ArgMatches, policy: &dyn Policy, output: &mut dyn io::W let pp = openpgp::PacketPile::from(packets); let cert = openpgp::Cert::try_from(pp)?; inspect_cert(policy, output, &cert, - print_keygrips, print_certifications)?; + print_certifications)?; } else if packets.is_empty() && ! sigs.is_empty() { writeln!(output, "Detached signature{}.", if sigs.len() > 1 { "s" } else { "" })?; @@ -134,7 +133,7 @@ pub fn inspect(m: &clap::ArgMatches, policy: &dyn Policy, output: &mut dyn io::W fn inspect_cert(policy: &dyn Policy, output: &mut dyn io::Write, cert: &openpgp::Cert, - print_keygrips: bool, print_certifications: bool) -> Result<()> { + print_certifications: bool) -> Result<()> { if cert.is_tsk() { writeln!(output, "Transferable Secret Key.")?; } else { @@ -144,14 +143,14 @@ fn inspect_cert(policy: &dyn Policy, writeln!(output, " Fingerprint: {}", cert.fingerprint())?; inspect_revocation(output, "", cert.revocation_status(policy, None))?; inspect_key(policy, output, "", cert.keys().nth(0).unwrap(), - print_keygrips, print_certifications)?; + print_certifications)?; writeln!(output)?; for vka in cert.keys().subkeys().with_policy(policy, None) { writeln!(output, " Subkey: {}", vka.key().fingerprint())?; inspect_revocation(output, "", vka.revocation_status())?; inspect_key(policy, output, "", vka.into_key_amalgamation().into(), - print_keygrips, print_certifications)?; + print_certifications)?; writeln!(output)?; } @@ -226,7 +225,6 @@ fn inspect_key(policy: &dyn Policy, output: &mut dyn io::Write, indent: &str, ka: ErasedKeyAmalgamation<PublicParts>, - print_keygrips: bool, print_certifications: bool) -> Result<()> { @@ -245,11 +243,6 @@ fn inspect_key(policy: &dyn Policy, }, }; - if print_keygrips { - use sequoia_ipc::Keygrip; - writeln!(output, "{} Keygrip: {}", indent, - Keygrip::of(key.mpis())?)?; - } writeln!(output, "{}Public-key algo: {}", indent, key.pk_algo())?; if let Some(bits) = key.mpis().bits() { writeln!(output, "{}Public-key size: {} bits", indent, bits)?; diff --git a/sq/src/sq-usage.rs b/sq/src/sq-usage.rs index 5c0ff4f1..9121ce29 100644 --- a/sq/src/sq-usage.rs +++ b/sq/src/sq-usage.rs @@ -458,7 +458,6 @@ //! FLAGS: //! --certifications Print third-party certifications //! -h, --help Prints help information -//! --keygrips Print keygrips of keys and subkeys //! -V, --version Prints version information //! //! ARGS: diff --git a/sq/src/sq_cli.rs b/sq/src/sq_cli.rs index 86e86310..f77cb41f 100644 --- a/sq/src/sq_cli.rs +++ b/sq/src/sq_cli.rs @@ -278,9 +278,6 @@ pub fn build() -> App<'static, 'static> { .about("Inspects a sequence of OpenPGP packets") .arg(Arg::with_name("input").value_name("FILE") .help("Sets the input file to use")) - .arg(Arg::with_name("keygrips") - .long("keygrips") - .help("Print keygrips of keys and subkeys")) .arg(Arg::with_name("certifications") .long("certifications") .help("Print third-party certifications"))) |