summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2020-11-24 10:51:25 +0100
committerJustus Winter <justus@sequoia-pgp.org>2020-11-24 10:51:25 +0100
commit7427474e69c8df2def191c9895a5c3bfab72429d (patch)
treee4e56164e884bea952856c696de99c99ee7591c8
parent333d8c3d9e18560a423a1caed857303206c52de2 (diff)
openpgp: Avoid direct dependency on generic-array.
-rw-r--r--Cargo.lock1
-rw-r--r--openpgp/Cargo.toml1
-rw-r--r--openpgp/src/crypto/backend/sha1cd.rs3
3 files changed, 1 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 1160d891..b8503533 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1897,7 +1897,6 @@ dependencies = [
"dyn-clone",
"ed25519-dalek",
"flate2",
- "generic-array 0.14.4",
"idna",
"lalrpop",
"lalrpop-util",
diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml
index bcb8decf..20f48737 100644
--- a/openpgp/Cargo.toml
+++ b/openpgp/Cargo.toml
@@ -32,7 +32,6 @@ bzip2 = { version = "0.4", optional = true }
digest = "0.9"
dyn-clone = "1"
flate2 = { version = "1.0.1", optional = true }
-generic-array = "0.14"
idna = "0.2"
lalrpop-util = "0.19"
lazy_static = "1.3"
diff --git a/openpgp/src/crypto/backend/sha1cd.rs b/openpgp/src/crypto/backend/sha1cd.rs
index c7e362be..dd4664ca 100644
--- a/openpgp/src/crypto/backend/sha1cd.rs
+++ b/openpgp/src/crypto/backend/sha1cd.rs
@@ -19,8 +19,7 @@ impl Digest for sha1collisiondetection::Sha1CD {
}
fn digest(&mut self, digest: &mut [u8]) -> Result<()> {
- let mut d =
- generic_array::GenericArray::<u8, digest::consts::U20>::default();
+ let mut d = digest::Output::<sha1collisiondetection::Sha1CD>::default();
let r = self.finalize_into_dirty_cd(&mut d);
digest::Reset::reset(self);
let l = digest.len().min(d.len());