age: Move native recipient types into submodule

Author: str4d

age/src/lib.rs

@@ -249,9 +249,11 @@ pub use simple::encrypt_and_armor;
 // Identity types
 //
 
+mod native;
+pub use native::scrypt;
+pub use native::x25519;
+
 pub mod encrypted;
-pub mod scrypt;
-pub mod x25519;
 
 #[cfg(feature = "plugin")]
 #[cfg_attr(docsrs, doc(cfg(feature = "plugin")))]

age/src/native.rs

@@ -0,0 +1,2 @@
+pub mod scrypt;
+pub mod x25519;

age/src/scrypt.rs age/src/native/scrypt.rsage/src/scrypt.rs renamed to age/src/native/scrypt.rs

@@ -23,7 +23,7 @@ use crate::{
     util::read::{base64_arg, decimal_digit_arg},
 };
 
-pub(super) const SCRYPT_RECIPIENT_TAG: &str = "scrypt";
+pub(crate) const SCRYPT_RECIPIENT_TAG: &str = "scrypt";
 const SCRYPT_SALT_LABEL: &[u8] = b"age-encryption.org/v1/scrypt";
 const ONE_SECOND: Duration = Duration::from_secs(1);
 

age/src/x25519.rs age/src/native/x25519.rsage/src/x25519.rs renamed to age/src/native/x25519.rs

@@ -27,8 +27,8 @@ const PUBLIC_KEY_PREFIX: &str = "age";
 pub(super) const X25519_RECIPIENT_TAG: &str = "X25519";
 const X25519_RECIPIENT_KEY_LABEL: &[u8] = b"age-encryption.org/v1/X25519";
 
-pub(super) const EPK_LEN_BYTES: usize = 32;
-pub(super) const ENCRYPTED_FILE_KEY_BYTES: usize = FILE_KEY_BYTES + 16;
+pub(crate) const EPK_LEN_BYTES: usize = 32;
+pub(crate) const ENCRYPTED_FILE_KEY_BYTES: usize = FILE_KEY_BYTES + 16;
 
 /// The standard age identity type, which can decrypt files encrypted to the corresponding
 /// [`Recipient`].