summaryrefslogtreecommitdiffstats
path: root/openpgp/src
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2023-10-26 14:03:38 +0200
committerNeal H. Walfield <neal@pep.foundation>2023-10-26 14:03:38 +0200
commit27e4f81462879b059471f44acec465050d99c72d (patch)
treed920bd71fafc8f6cbe17ea4ac3e201ae1c77c1ac /openpgp/src
parent20556b4d61e8f5e4c087af8064ea87c3270e28a2 (diff)
openpgp: Drop generic-array direct dependency
- Use `cipher`'s reexport of `generic-array` instead of directly depending on `generic-array` and having to worry about synchronizing the versions.
Diffstat (limited to 'openpgp/src')
-rw-r--r--openpgp/src/crypto/backend/rust.rs2
-rw-r--r--openpgp/src/crypto/backend/rust/aead.rs2
-rw-r--r--openpgp/src/crypto/backend/rust/symmetric.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/openpgp/src/crypto/backend/rust.rs b/openpgp/src/crypto/backend/rust.rs
index 90e0ed16..e373dba3 100644
--- a/openpgp/src/crypto/backend/rust.rs
+++ b/openpgp/src/crypto/backend/rust.rs
@@ -1,7 +1,7 @@
//! Implementation of Sequoia crypto API using pure Rust cryptographic
//! libraries.
-use generic_array::{ArrayLength, GenericArray};
+use cipher::generic_array::{ArrayLength, GenericArray};
use crate::{Error, Result};
use crate::types::*;
diff --git a/openpgp/src/crypto/backend/rust/aead.rs b/openpgp/src/crypto/backend/rust/aead.rs
index 9bd4a317..69f67940 100644
--- a/openpgp/src/crypto/backend/rust/aead.rs
+++ b/openpgp/src/crypto/backend/rust/aead.rs
@@ -6,7 +6,7 @@ use std::cmp::Ordering;
use cipher::{BlockCipher, BlockEncrypt, BlockSizeUser, KeyInit, Unsigned};
use cipher::consts::{U12, U16};
use eax::online::{Eax, Encrypt, Decrypt};
-use generic_array::GenericArray;
+use cipher::generic_array::GenericArray;
use crate::{Error, Result};
use crate::crypto::aead::{Aead, CipherOp};
diff --git a/openpgp/src/crypto/backend/rust/symmetric.rs b/openpgp/src/crypto/backend/rust/symmetric.rs
index 1869f1b9..f96def91 100644
--- a/openpgp/src/crypto/backend/rust/symmetric.rs
+++ b/openpgp/src/crypto/backend/rust/symmetric.rs
@@ -4,7 +4,7 @@ use cipher::BlockDecryptMut;
use cipher::BlockEncryptMut;
use cipher::KeyInit;
use cipher::KeyIvInit;
-use generic_array::{ArrayLength, GenericArray};
+use cipher::generic_array::{ArrayLength, GenericArray};
use crate::{Error, Result};
use crate::crypto::symmetric::Mode;