age-core: Re-export secrecy crate

Cargo.lock

@@ -79,7 +79,6 @@ dependencies = [
  "rsa",
  "rust-embed",
  "scrypt",
- "secrecy",
  "sha2",
  "subtle",
  "web-sys",
@@ -112,7 +111,6 @@ dependencies = [
  "bech32",
  "chrono",
  "gumdrop",
- "secrecy",
 ]
 
 [[package]]

age-core/CHANGELOG.md

@@ -8,6 +8,7 @@ to 1.0.0 are beta releases.
 
 ## [Unreleased]
 ### Added
+- `age_core::secrecy`, which re-exports the `secrecy` crate.
 - `age_core::plugin::Error`
 
 ### Changed

age-core/src/lib.rs

@@ -1,6 +1,9 @@
 // Catch documentation errors caused by code changes.
 #![deny(broken_intra_doc_links)]
 
+// Re-export crates that are used in our public API.
+pub use secrecy;
+
 pub mod format;
 pub mod primitives;
 

age-plugin/Cargo.toml

@@ -12,7 +12,6 @@ edition = "2018"
 age-core = { version = "0.6.0", path = "../age-core", features = ["plugin"] }
 bech32 = "0.8"
 chrono = "0.4"
-secrecy = "0.8"
 
 [dev-dependencies]
 gumdrop = "0.8"

age-plugin/examples/age-plugin-unencrypted.rs

@@ -1,4 +1,7 @@
-use age_core::format::{FileKey, Stanza};
+use age_core::{
+    format::{FileKey, Stanza},
+    secrecy::ExposeSecret,
+};
 use age_plugin::{
     identity::{self, IdentityPluginV1},
     print_new_identity,
@@ -6,7 +9,6 @@ use age_plugin::{
     run_state_machine, Callbacks,
 };
 use gumdrop::Options;
-use secrecy::ExposeSecret;
 use std::collections::HashMap;
 use std::convert::TryInto;
 use std::io;

age-plugin/src/identity.rs

@@ -3,9 +3,9 @@
 use age_core::{
     format::{FileKey, Stanza},
     plugin::{self, BidirSend, Connection},
+    secrecy::{ExposeSecret, SecretString},
 };
 use bech32::FromBase32;
-use secrecy::{ExposeSecret, SecretString};
 use std::collections::HashMap;
 use std::io;
 

age-plugin/src/lib.rs

@@ -165,8 +165,8 @@
 #![deny(broken_intra_doc_links)]
 #![deny(missing_docs)]
 
+use age_core::secrecy::SecretString;
 use bech32::Variant;
-use secrecy::SecretString;
 use std::io;
 
 pub mod identity;

age-plugin/src/recipient.rs

@@ -3,9 +3,9 @@
 use age_core::{
     format::{FileKey, Stanza, FILE_KEY_BYTES},
     plugin::{self, BidirSend, Connection},
+    secrecy::SecretString,
 };
 use bech32::FromBase32;
-use secrecy::SecretString;
 use std::convert::TryInto;
 use std::io;
 

age/Cargo.toml

@@ -60,7 +60,6 @@ cookie-factory = "0.3.1"
 nom = { version = "7", default-features = false, features = ["alloc"] }
 
 # Secret management
-secrecy = "0.8"
 subtle = "2"
 zeroize = "1"
 

age/src/cli_common.rs

@@ -1,5 +1,6 @@
 //! Common helpers for CLI binaries.
 
+use age_core::secrecy::{ExposeSecret, SecretString};
 use pinentry::PassphraseInput;
 use rand::{
     distributions::{Distribution, Uniform},
@@ -7,7 +8,6 @@ use rand::{
     CryptoRng, RngCore,
 };
 use rpassword::read_password_from_tty;
-use secrecy::{ExposeSecret, SecretString};
 use std::fmt;
 use std::fs::File;
 use std::io::{self, BufReader};

age/src/encrypted.rs

@@ -212,7 +212,7 @@ impl<R: io::Read, C: Callbacks + Clone + 'static> crate::Identity for Identity<R
 mod tests {
     use std::{cell::Cell, io::BufReader};
 
-    use secrecy::{ExposeSecret, SecretString};
+    use age_core::secrecy::{ExposeSecret, SecretString};
 
     use super::Identity;
     use crate::{
@@ -254,7 +254,7 @@ fOrxrKTj7xCdNS3+OrCdnBC8Z9cKDxjCGWW3fkjLsYha0Jo=
         }
 
         /// This intentionally panics if called twice.
-        fn request_passphrase(&self, _: &str) -> Option<secrecy::SecretString> {
+        fn request_passphrase(&self, _: &str) -> Option<SecretString> {
             Some(SecretString::new(self.0.take().unwrap().to_owned()))
         }
     }

age/src/identity.rs

@@ -128,7 +128,7 @@ impl IdentityFile {
 
 #[cfg(test)]
 pub(crate) mod tests {
-    use secrecy::ExposeSecret;
+    use age_core::secrecy::ExposeSecret;
     use std::io::BufReader;
 
     use super::{IdentityFile, IdentityFileEntry};

age/src/keys.rs

@@ -1,8 +1,11 @@
 //! Key structs and serialization.
 
-use age_core::{format::FileKey, primitives::hkdf};
+use age_core::{
+    format::FileKey,
+    primitives::hkdf,
+    secrecy::{ExposeSecret, Secret},
+};
 use rand::{rngs::OsRng, RngCore};
-use secrecy::{ExposeSecret, Secret};
 
 use crate::{
     error::DecryptError,

age/src/lib.rs

@@ -83,7 +83,7 @@
 //! ## Passphrase-based encryption
 //!
 //! ```
-//! use secrecy::Secret;
+//! use age_core::secrecy::Secret;
 //! use std::io::{Read, Write};
 //!
 //! # fn run_main() -> Result<(), ()> {
@@ -177,8 +177,10 @@ pub mod plugin;
 #[cfg_attr(docsrs, doc(cfg(feature = "ssh")))]
 pub mod ssh;
 
-use age_core::format::{FileKey, Stanza};
+use age_core::{
-use secrecy::SecretString;
+    format::{FileKey, Stanza},
+    secrecy::SecretString,
+};
 
 /// A private key or other value that can unwrap an opaque file key from a recipient
 /// stanza.

age/src/plugin.rs

@@ -3,9 +3,9 @@
 use age_core::{
     format::{FileKey, Stanza},
     plugin::{Connection, IDENTITY_V1, RECIPIENT_V1},
+    secrecy::ExposeSecret,
 };
 use bech32::Variant;
-use secrecy::ExposeSecret;
 use std::convert::TryInto;
 use std::fmt;
 use std::io;

age/src/primitives.rs

@@ -1,11 +1,11 @@
 //! Primitive cryptographic operations used by `age`.
 
+use age_core::secrecy::{ExposeSecret, Secret};
 use hmac::{
     crypto_mac::{MacError, Output},
     Hmac, Mac, NewMac,
 };
 use scrypt::{errors::InvalidParams, scrypt as scrypt_inner, Params as ScryptParams};
-use secrecy::{ExposeSecret, Secret};
 use sha2::Sha256;
 use std::io::{self, Write};
 

age/src/primitives/stream.rs

@@ -1,11 +1,11 @@
 //! I/O helper structs for age file encryption and decryption.
 
+use age_core::secrecy::{ExposeSecret, SecretVec};
 use chacha20poly1305::{
     aead::{generic_array::GenericArray, Aead, NewAead},
     ChaCha20Poly1305,
 };
 use pin_project::pin_project;
-use secrecy::{ExposeSecret, SecretVec};
 use std::cmp;
 use std::convert::TryInto;
 use std::io::{self, Read, Seek, SeekFrom, Write};
@@ -643,7 +643,7 @@ impl<R: Read + Seek> Seek for StreamReader<R> {
 
 #[cfg(test)]
 mod tests {
-    use secrecy::ExposeSecret;
+    use age_core::secrecy::ExposeSecret;
     use std::io::{self, Cursor, Read, Seek, SeekFrom, Write};
 
     use super::{PayloadKey, Stream, CHUNK_SIZE};

age/src/protocol.rs

@@ -1,8 +1,7 @@
 //! Encryption and decryption routines for age.
 
-use age_core::format::grease_the_joint;
+use age_core::{format::grease_the_joint, secrecy::SecretString};
 use rand::{rngs::OsRng, RngCore};
-use secrecy::SecretString;
 use std::io::{self, Read, Write};
 
 use crate::{
@@ -214,7 +213,7 @@ impl<R: AsyncRead + Unpin> Decryptor<R> {
 
 #[cfg(test)]
 mod tests {
-    use secrecy::SecretString;
+    use age_core::secrecy::SecretString;
     use std::io::{BufReader, Read, Write};
 
     #[cfg(feature = "ssh")]

age/src/protocol/decryptor.rs

@@ -1,7 +1,9 @@
 //! Decryptors for age.
 
-use age_core::format::{FileKey, Stanza};
+use age_core::{
-use secrecy::SecretString;
+    format::{FileKey, Stanza},
+    secrecy::SecretString,
+};
 use std::io::Read;
 
 use super::Nonce;

age/src/scrypt.rs

@@ -1,9 +1,9 @@
 use age_core::{
     format::{FileKey, Stanza, FILE_KEY_BYTES},
     primitives::{aead_decrypt, aead_encrypt},
+    secrecy::{ExposeSecret, SecretString},
 };
 use rand::{rngs::OsRng, RngCore};
-use secrecy::{ExposeSecret, SecretString};
 use std::convert::TryInto;
 use std::time::Duration;
 use zeroize::Zeroize;

age/src/ssh.rs

@@ -8,8 +8,8 @@
 //! a short 32-bit ID of the public key.
 
 use aes::{Aes128Ctr, Aes192Ctr, Aes256, Aes256Ctr};
+use age_core::secrecy::{ExposeSecret, SecretString};
 use bcrypt_pbkdf::bcrypt_pbkdf;
-use secrecy::{ExposeSecret, SecretString};
 use sha2::{Digest, Sha256};
 
 use crate::error::DecryptError;
@@ -113,8 +113,8 @@ mod decrypt {
     use aes::cipher::{
         BlockCipher, BlockDecrypt, BlockEncrypt, NewBlockCipher, NewCipher, StreamCipher,
     };
+    use age_core::secrecy::SecretString;
     use block_modes::{block_padding::NoPadding, BlockMode, Cbc};
-    use secrecy::SecretString;
 
     use super::OpenSshKdf;
     use crate::error::DecryptError;
@@ -270,6 +270,7 @@ mod read_asn1 {
 }
 
 mod read_ssh {
+    use age_core::secrecy::Secret;
     use curve25519_dalek::edwards::{CompressedEdwardsY, EdwardsPoint};
     use nom::{
         branch::alt,
@@ -282,7 +283,6 @@ mod read_ssh {
     };
     use num_traits::Zero;
     use rsa::BigUint;
-    use secrecy::Secret;
 
     use super::{
         identity::{UnencryptedKey, UnsupportedKey},

age/src/ssh/identity.rs

@@ -1,6 +1,7 @@
 use age_core::{
     format::{FileKey, Stanza, FILE_KEY_BYTES},
     primitives::{aead_decrypt, hkdf},
+    secrecy::{ExposeSecret, Secret},
 };
 use i18n_embed_fl::fl;
 use nom::{
@@ -13,7 +14,6 @@ use nom::{
 };
 use rand::rngs::OsRng;
 use rsa::padding::PaddingScheme;
-use secrecy::{ExposeSecret, Secret};
 use sha2::{Digest, Sha256, Sha512};
 use std::convert::TryInto;
 use std::fmt;
@@ -345,7 +345,7 @@ pub(crate) fn ssh_identity(input: &str) -> IResult<&str, Identity> {
 
 #[cfg(test)]
 pub(crate) mod tests {
-    use secrecy::ExposeSecret;
+    use age_core::secrecy::ExposeSecret;
     use std::io::BufReader;
 
     use super::Identity;

age/src/ssh/recipient.rs

@@ -1,6 +1,7 @@
 use age_core::{
     format::{FileKey, Stanza},
     primitives::{aead_encrypt, hkdf},
+    secrecy::ExposeSecret,
 };
 use curve25519_dalek::edwards::EdwardsPoint;
 use nom::{
@@ -12,7 +13,6 @@ use nom::{
 };
 use rand::rngs::OsRng;
 use rsa::{padding::PaddingScheme, PublicKey};
-use secrecy::ExposeSecret;
 use sha2::Sha256;
 use std::convert::TryFrom;
 use std::fmt;

age/src/x25519.rs

@@ -3,11 +3,10 @@
 use age_core::{
     format::{FileKey, Stanza, FILE_KEY_BYTES},
     primitives::{aead_decrypt, aead_encrypt, hkdf},
+    secrecy::{ExposeSecret, SecretString},
 };
 use bech32::{ToBase32, Variant};
 use rand_7::rngs::OsRng;
-use secrecy::ExposeSecret;
-use secrecy::SecretString;
 use std::convert::TryInto;
 use std::fmt;
 use x25519_dalek::{EphemeralSecret, PublicKey, StaticSecret};
@@ -188,9 +187,9 @@ impl crate::Recipient for Recipient {
 
 #[cfg(test)]
 pub(crate) mod tests {
+    use age_core::secrecy::ExposeSecret;
     use quickcheck::TestResult;
     use quickcheck_macros::quickcheck;
-    use secrecy::ExposeSecret;
     use x25519_dalek::{PublicKey, StaticSecret};
 
     use super::{Identity, Recipient};

age/tests/test_vectors.rs

@@ -1,4 +1,4 @@
-use secrecy::SecretString;
+use age_core::secrecy::SecretString;
 use std::fs;
 use std::io::Read;