7 files changed, 8 insertions, 7 deletions
diff --git a/openpgp/src/crypto/mod.rs b/openpgp/src/crypto/mod.rs
index 904eaea2..51db3b18 100644
--- a/openpgp/src/crypto/mod.rs
+++ b/openpgp/src/crypto/mod.rs
@@ -17,7 +17,8 @@ mod keygrip;
 pub use self::keygrip::Keygrip;
 pub mod mem;
 pub mod mpis;
-pub mod s2k;
+mod s2k;
+pub use s2k::S2K;
 pub mod sexp;
 pub(crate) mod symmetric;
 
diff --git a/openpgp/src/message/mod.rs b/openpgp/src/message/mod.rs
index b08de710..0839d482 100644
--- a/openpgp/src/message/mod.rs
+++ b/openpgp/src/message/mod.rs
@@ -450,7 +450,7 @@ mod tests {
     use crate::SymmetricAlgorithm;
     use crate::PublicKeyAlgorithm;
     use crate::SignatureType;
-    use crate::crypto::s2k::S2K;
+    use crate::crypto::S2K;
     use crate::crypto::mpis::{Ciphertext, MPI};
     use crate::packet::prelude::*;
     use crate::KeyID;
diff --git a/openpgp/src/packet/key/mod.rs b/openpgp/src/packet/key/mod.rs
index 03b81eef..ce49c7ce 100644
--- a/openpgp/src/packet/key/mod.rs
+++ b/openpgp/src/packet/key/mod.rs
@@ -64,7 +64,7 @@ use crate::PublicKeyAlgorithm;
 use crate::SymmetricAlgorithm;
 use crate::HashAlgorithm;
 use crate::types::{Curve, Timestamp};
-use crate::crypto::s2k::S2K;
+use crate::crypto::S2K;
 use crate::Result;
 use crate::crypto::Password;
 use crate::KeyID;
diff --git a/openpgp/src/packet/skesk.rs b/openpgp/src/packet/skesk.rs
index 77d3cf4a..79a99747 100644
--- a/openpgp/src/packet/skesk.rs
+++ b/openpgp/src/packet/skesk.rs
@@ -11,7 +11,7 @@ use quickcheck::{Arbitrary, Gen};
 
 use crate::Result;
 use crate::crypto;
-use crate::crypto::s2k::S2K;
+use crate::crypto::S2K;
 use crate::Error;
 use crate::types::{
     AEADAlgorithm,
diff --git a/openpgp/src/parse/parse.rs b/openpgp/src/parse/parse.rs
index 9b58d495..b4093d1d 100644
--- a/openpgp/src/parse/parse.rs
+++ b/openpgp/src/parse/parse.rs
@@ -18,7 +18,7 @@ use crate::{
         BodyLength,
         ctb::PacketLengthType,
     },
-    crypto::s2k::S2K,
+    crypto::S2K,
     Error,
     packet::{
         Container,
diff --git a/openpgp/src/serialize/mod.rs b/openpgp/src/serialize/mod.rs
index d593ccc5..92ce5f2a 100644
--- a/openpgp/src/serialize/mod.rs
+++ b/openpgp/src/serialize/mod.rs
@@ -26,7 +26,7 @@ pub mod writer;
 pub mod stream;
 #[cfg(feature = "compression-deflate")]
 pub mod padding;
-use crate::crypto::s2k::S2K;
+use crate::crypto::S2K;
 use crate::packet::header::{
     BodyLength,
     CTB,
diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs
index 6ef29acd..16ff8ac7 100644
--- a/tool/src/commands/dump.rs
+++ b/tool/src/commands/dump.rs
@@ -9,7 +9,7 @@ use self::openpgp::packet::prelude::*;
 use self::openpgp::packet::header::CTB;
 use self::openpgp::packet::{Header, header::BodyLength, Signature};
 use self::openpgp::packet::signature::subpacket::{Subpacket, SubpacketValue};
-use self::openpgp::crypto::{SessionKey, s2k::S2K};
+use self::openpgp::crypto::{SessionKey, S2K};
 use self::openpgp::parse::{map::Map, Parse, PacketParserResult};
 
 #[derive(Debug)]