summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2020-08-17 16:23:59 +0200
committerJustus Winter <justus@sequoia-pgp.org>2020-08-17 16:41:44 +0200
commit303057988fe6dde9aacaaa827806de1f7426984a (patch)
tree45e3a30cfc8855517b972b7d9682007d6dc2a428 /ipc
parent3d6e450c38fc3c19d8afb8d00a052edd1f2fe4b8 (diff)
openpgp: Rename PublicKey::keygrip to Keygrip::of.
- This allows us to move Keygrip to a different crate.
Diffstat (limited to 'ipc')
-rw-r--r--ipc/src/gnupg.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/ipc/src/gnupg.rs b/ipc/src/gnupg.rs
index b81e0927..ddb82aa4 100644
--- a/ipc/src/gnupg.rs
+++ b/ipc/src/gnupg.rs
@@ -14,6 +14,7 @@ use sequoia_openpgp as openpgp;
use openpgp::types::HashAlgorithm;
use openpgp::fmt::hex;
use openpgp::crypto;
+use openpgp::crypto::Keygrip;
use openpgp::packet::prelude::*;
use openpgp::parse::Parse;
use openpgp::serialize::Serialize;
@@ -417,7 +418,7 @@ impl<'a, 'b, 'c, R> Future for SigningRequest<'a, 'b, 'c, R>
Start => {
if self.options.is_empty() {
self.c.send(format!("SIGKEY {}",
- self.key.mpis().keygrip()?))?;
+ Keygrip::of(self.key.mpis())?))?;
self.state = SigKey;
} else {
self.c.send(self.options.pop().unwrap())?;
@@ -441,7 +442,7 @@ impl<'a, 'b, 'c, R> Future for SigningRequest<'a, 'b, 'c, R>
self.c.send(option)?;
} else {
self.c.send(format!("SIGKEY {}",
- self.key.mpis().keygrip()?))?;
+ Keygrip::of(self.key.mpis())?))?;
self.state = SigKey;
}
},
@@ -565,7 +566,7 @@ impl<'a, 'b, 'c, R> Future for DecryptionRequest<'a, 'b, 'c, R>
Start => {
if self.options.is_empty() {
self.c.send(format!("SETKEY {}",
- self.key.mpis().keygrip()?))?;
+ Keygrip::of(self.key.mpis())?))?;
self.state = SetKey;
} else {
self.c.send(self.options.pop().unwrap())?;
@@ -589,7 +590,7 @@ impl<'a, 'b, 'c, R> Future for DecryptionRequest<'a, 'b, 'c, R>
self.c.send(option)?;
} else {
self.c.send(format!("SETKEY {}",
- self.key.mpis().keygrip()?))?;
+ Keygrip::of(self.key.mpis())?))?;
self.state = SetKey;
}
},