diff options
-rw-r--r-- | openpgp/src/crypto/mod.rs | 1 | ||||
-rw-r--r-- | openpgp/src/crypto/s2k.rs (renamed from openpgp/src/s2k.rs) | 0 | ||||
-rw-r--r-- | openpgp/src/lib.rs | 2 | ||||
-rw-r--r-- | openpgp/src/message/mod.rs | 2 | ||||
-rw-r--r-- | openpgp/src/packet/key.rs | 2 | ||||
-rw-r--r-- | openpgp/src/packet/skesk.rs | 2 | ||||
-rw-r--r-- | openpgp/src/parse/parse.rs | 2 | ||||
-rw-r--r-- | openpgp/src/serialize/mod.rs | 2 | ||||
-rw-r--r-- | tool/src/commands/dump.rs | 2 |
9 files changed, 7 insertions, 8 deletions
diff --git a/openpgp/src/crypto/mod.rs b/openpgp/src/crypto/mod.rs index af673c7f..3c4243cb 100644 --- a/openpgp/src/crypto/mod.rs +++ b/openpgp/src/crypto/mod.rs @@ -3,4 +3,5 @@ pub(crate) mod aead; pub(crate) mod ecdh; mod hash; +pub mod s2k; pub(crate) mod symmetric; diff --git a/openpgp/src/s2k.rs b/openpgp/src/crypto/s2k.rs index d8a00ac8..d8a00ac8 100644 --- a/openpgp/src/s2k.rs +++ b/openpgp/src/crypto/s2k.rs diff --git a/openpgp/src/lib.rs b/openpgp/src/lib.rs index 4feb10d5..4049e68c 100644 --- a/openpgp/src/lib.rs +++ b/openpgp/src/lib.rs @@ -112,8 +112,6 @@ pub mod mpis; pub mod tpk; pub mod serialize; -pub mod s2k; - mod reader; pub use reader::Reader; diff --git a/openpgp/src/message/mod.rs b/openpgp/src/message/mod.rs index 6f9c2ebc..29185d11 100644 --- a/openpgp/src/message/mod.rs +++ b/openpgp/src/message/mod.rs @@ -400,7 +400,7 @@ mod tests { use SymmetricAlgorithm; use PublicKeyAlgorithm; use SignatureType; - use s2k::S2K; + use crypto::s2k::S2K; use mpis::{Ciphertext, MPI}; use packet::Tag; use packet::CompressedData; diff --git a/openpgp/src/packet/key.rs b/openpgp/src/packet/key.rs index 8c3b376b..485fe981 100644 --- a/openpgp/src/packet/key.rs +++ b/openpgp/src/packet/key.rs @@ -8,7 +8,7 @@ use packet; use Packet; use PublicKeyAlgorithm; use SymmetricAlgorithm; -use s2k::S2K; +use crypto::s2k::S2K; use Result; use conversions::Time; use Password; diff --git a/openpgp/src/packet/skesk.rs b/openpgp/src/packet/skesk.rs index 35957ddb..9940c91a 100644 --- a/openpgp/src/packet/skesk.rs +++ b/openpgp/src/packet/skesk.rs @@ -3,7 +3,7 @@ use std::ops::{Deref, DerefMut}; use nettle::Yarrow; use Result; -use s2k::S2K; +use crypto::s2k::S2K; use Error; use constants::{ AEADAlgorithm, diff --git a/openpgp/src/parse/parse.rs b/openpgp/src/parse/parse.rs index e9d060b3..9affe75b 100644 --- a/openpgp/src/parse/parse.rs +++ b/openpgp/src/parse/parse.rs @@ -19,7 +19,7 @@ use { Result, CTB, BodyLength, - s2k::S2K, + crypto::s2k::S2K, Error, packet::Tag, Header, diff --git a/openpgp/src/serialize/mod.rs b/openpgp/src/serialize/mod.rs index 93dff1d3..6199dc3e 100644 --- a/openpgp/src/serialize/mod.rs +++ b/openpgp/src/serialize/mod.rs @@ -18,7 +18,7 @@ mod partial_body; use self::partial_body::PartialBodyFilter; pub mod writer; pub mod stream; -use s2k::S2K; +use crypto::s2k::S2K; use packet::signature::subpacket::{ Subpacket, SubpacketValue, SubpacketLengthTrait, }; diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs index 2ddc7aaa..7a489358 100644 --- a/tool/src/commands/dump.rs +++ b/tool/src/commands/dump.rs @@ -6,7 +6,7 @@ use openpgp::{Packet, Result}; use openpgp::packet::ctb::CTB; use openpgp::packet::{Header, BodyLength, Signature}; use openpgp::packet::signature::subpacket::{Subpacket, SubpacketValue}; -use openpgp::s2k::S2K; +use openpgp::crypto::s2k::S2K; use openpgp::parse::{map::Map, PacketParserResult}; use super::TIMEFMT; |