diff options
author | Igor Matuszewski <igor@sequoia-pgp.org> | 2020-04-05 19:42:28 +0200 |
---|---|---|
committer | Igor Matuszewski <igor@sequoia-pgp.org> | 2020-04-08 17:35:44 +0200 |
commit | e9f1216d8d5c4de851bfe9f98d65bce473320e9f (patch) | |
tree | f94a99744c1cc0595d010930a767269b12db8a15 /openpgp/src/packet/pkesk.rs | |
parent | 6e065c1cc0054770a59fd84ca05d8e47feed793c (diff) |
openpgp: Rename crypto::mpis to crypto::mpi
To be consistent; we don't use plural forms for modules anywhere else
and Rust always uses singular forms.
Diffstat (limited to 'openpgp/src/packet/pkesk.rs')
-rw-r--r-- | openpgp/src/packet/pkesk.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openpgp/src/packet/pkesk.rs b/openpgp/src/packet/pkesk.rs index 7ab9ccbb..6aa7eb66 100644 --- a/openpgp/src/packet/pkesk.rs +++ b/openpgp/src/packet/pkesk.rs @@ -12,7 +12,7 @@ use crate::packet::key; use crate::packet::Key; use crate::KeyID; use crate::crypto::Decryptor; -use crate::crypto::mpis::Ciphertext; +use crate::crypto::mpi::Ciphertext; use crate::Packet; use crate::PublicKeyAlgorithm; use crate::Result; @@ -337,7 +337,7 @@ mod tests { fn decrypt_with_short_cv25519_secret_key() { use super::PKESK3; use crate::crypto::SessionKey; - use crate::crypto::mpis::{self, MPI}; + use crate::crypto::mpi::{self, MPI}; use crate::PublicKeyAlgorithm; use crate::SymmetricAlgorithm; use crate::HashAlgorithm; @@ -357,13 +357,13 @@ mod tests { curve25519::mul_g(&mut pnt[1..], &sec[..]).unwrap(); sec.reverse(); - let public_mpis = mpis::PublicKey::ECDH { + let public_mpis = mpi::PublicKey::ECDH { curve: Curve::Cv25519, q: MPI::new(&pnt[..]), hash: HashAlgorithm::SHA256, sym: SymmetricAlgorithm::AES256, }; - let private_mpis = mpis::SecretKeyMaterial::ECDH { + let private_mpis = mpi::SecretKeyMaterial::ECDH { scalar: MPI::new(&sec[..]).into(), }; let key: key::UnspecifiedPublic |