diff options
| author | Igor Matuszewski <igor@sequoia-pgp.org> | 2019-12-19 01:30:24 +0100 |
|---|---|---|
| committer | Igor Matuszewski <igor@sequoia-pgp.org> | 2020-01-28 16:44:58 +0100 |
| commit | 300bd3e016d264cdf1cec06c9d09e411c550ded9 (patch) | |
| tree | 9534337bc189453b5d6bfdd62fe497da09604eb9 | |
| parent | e48f3ba80a3e83364d7831c5cc62684e7a14a45a (diff) | |
openpgp: Make some use statements more consistent
| -rw-r--r-- | openpgp/src/crypto/symmetric.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/openpgp/src/crypto/symmetric.rs b/openpgp/src/crypto/symmetric.rs index fb889dd4..bf9ba25d 100644 --- a/openpgp/src/crypto/symmetric.rs +++ b/openpgp/src/crypto/symmetric.rs @@ -11,14 +11,13 @@ use crate::vec_truncate; use buffered_reader::BufferedReader; -use nettle::Cipher; -use nettle::Mode; +use nettle::cipher::{self, Cipher}; +use nettle::mode::{self, Mode}; impl SymmetricAlgorithm { /// Length of a key for this algorithm in bytes. Fails if Sequoia /// does not support this algorithm. pub fn key_size(self) -> Result<usize> { - use nettle::cipher; match self { SymmetricAlgorithm::TripleDES => Ok(cipher::Des3::KEY_SIZE), SymmetricAlgorithm::CAST5 => Ok(cipher::Cast128::KEY_SIZE), @@ -38,7 +37,6 @@ impl SymmetricAlgorithm { /// Length of a block for this algorithm in bytes. Fails if /// Sequoia does not support this algorithm. pub fn block_size(self) -> Result<usize> { - use nettle::cipher; match self { SymmetricAlgorithm::TripleDES => Ok(cipher::Des3::BLOCK_SIZE), SymmetricAlgorithm::CAST5 => Ok(cipher::Cast128::BLOCK_SIZE), @@ -56,7 +54,6 @@ impl SymmetricAlgorithm { /// Creates a Nettle context for encrypting in CFB mode. pub fn make_encrypt_cfb(self, key: &[u8]) -> Result<Box<dyn Mode>> { - use nettle::{mode, cipher}; match self { SymmetricAlgorithm::TripleDES => Ok(Box::new( @@ -94,7 +91,6 @@ impl SymmetricAlgorithm { /// Creates a Nettle context for decrypting in CFB mode. pub fn make_decrypt_cfb(self, key: &[u8]) -> Result<Box<dyn Mode>> { - use nettle::{mode, cipher}; match self { SymmetricAlgorithm::TripleDES => Ok(Box::new( |