summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2020-11-17 16:54:32 +0100
committerJustus Winter <justus@sequoia-pgp.org>2020-12-07 16:37:57 +0100
commitd05f6cecbaeda0be9eae6a80517c1839d581545e (patch)
tree6af2ad42f85b623022056c36d5ffa5ec5e2283e5 /ipc
parent3b88cd1725bdded57c2ff845db5d471d2da63e6a (diff)
openpgp: Drop hash::Context in favor of a pub trait hash::Digest.
Diffstat (limited to 'ipc')
-rw-r--r--ipc/src/keygrip.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/ipc/src/keygrip.rs b/ipc/src/keygrip.rs
index 1f4f3edf..968b975f 100644
--- a/ipc/src/keygrip.rs
+++ b/ipc/src/keygrip.rs
@@ -89,17 +89,16 @@ impl Keygrip {
/// ```
pub fn of(key: &PublicKey) -> Result<Keygrip> {
use openpgp::crypto::hash;
- use std::io::Write;
use self::PublicKey::*;
let mut hash = HashAlgorithm::SHA1.context().unwrap();
- fn hash_sexp_mpi(hash: &mut hash::Context, kind: char, prefix: &[u8],
+ fn hash_sexp_mpi(hash: &mut dyn hash::Digest, kind: char, prefix: &[u8],
mpi: &MPI)
{
hash_sexp(hash, kind, prefix, mpi.value());
}
- fn hash_sexp(hash: &mut hash::Context, kind: char, prefix: &[u8],
+ fn hash_sexp(hash: &mut dyn hash::Digest, kind: char, prefix: &[u8],
buf: &[u8])
{
write!(hash, "(1:{}{}:",
@@ -109,7 +108,7 @@ impl Keygrip {
write!(hash, ")").unwrap();
}
- fn hash_ecc(hash: &mut hash::Context, curve: &Curve, q: &MPI)
+ fn hash_ecc(hash: &mut dyn hash::Digest, curve: &Curve, q: &MPI)
{
for (i, name) in "pabgnhq".chars().enumerate() {
if i == 5 {