Fix codebase to allow Encryptor to implement Send

Fixes #344.

age/CHANGELOG.md

@@ -18,7 +18,10 @@ to 1.0.0 are beta releases.
 ### Changed
 - `age::Encryptor::with_recipients` now returns `Option<Encryptor>`, with `None`
   returned if the provided list of recipients is empty (to prevent files being
-  encrypted to no recipients).
+  encrypted to no recipients). The `recipients` argument is also now
+  `Vec<Box<dyn age::Recipient + Send>>`.
+- `age::encrypted::Identity::recipients` now returns
+  `Vec<Box<dyn age::Recipient + Send>>`.
 
 ### Fixed
 - `age::Decryptor` now rejects invalid or non-canonical `scrypt` recipient

age/benches/parser.rs

@@ -21,7 +21,7 @@ fn bench(c: &mut Criterion) {
                     .iter()
                     .take(count)
                     .cloned()
-                    .map(|r| r as Box<dyn Recipient>)
+                    .map(|r| r as Box<dyn Recipient + Send>)
                     .collect(),
             )
             .unwrap()

age/src/encrypted.rs

@@ -112,7 +112,7 @@ impl<R: io::Read, C: Callbacks> Identity<R, C> {
     ///
     /// If this encrypted identity has not been decrypted yet, calling this method will
     /// trigger a passphrase request.
-    pub fn recipients(&self) -> Result<Vec<Box<dyn crate::Recipient>>, EncryptError> {
+    pub fn recipients(&self) -> Result<Vec<Box<dyn crate::Recipient + Send>>, EncryptError> {
         match self
             .state
             .take()

age/src/identity.rs

@@ -38,7 +38,7 @@ impl IdentityFileEntry {
     pub(crate) fn to_recipient(
         &self,
         callbacks: impl Callbacks,
-    ) -> Result<Box<dyn crate::Recipient>, EncryptError> {
+    ) -> Result<Box<dyn crate::Recipient + Send>, EncryptError> {
         match self {
             IdentityFileEntry::Native(i) => Ok(Box::new(i.to_public())),
             #[cfg(feature = "plugin")]

age/src/protocol.rs

@@ -238,7 +238,7 @@ mod tests {
     use futures_test::task::noop_context;
 
     fn recipient_round_trip<'a>(
-        recipients: Vec<Box<dyn Recipient>>,
+        recipients: Vec<Box<dyn Recipient + Send>>,
         identities: impl Iterator<Item = &'a dyn Identity>,
     ) {
         let test_msg = b"This is a test message. For testing.";
@@ -264,7 +264,7 @@ mod tests {
 
     #[cfg(feature = "async")]
     fn recipient_async_round_trip<'a>(
-        recipients: Vec<Box<dyn Recipient>>,
+        recipients: Vec<Box<dyn Recipient + Send>>,
         identities: impl Iterator<Item = &'a dyn Identity>,
     ) {
         let test_msg = b"This is a test message. For testing.";

rage/src/bin/rage/main.rs

@@ -56,7 +56,7 @@ macro_rules! warning {
 fn parse_recipient(
     filename: &str,
     s: String,
-    recipients: &mut Vec<Box<dyn Recipient>>,
+    recipients: &mut Vec<Box<dyn Recipient + Send>>,
     plugin_recipients: &mut Vec<plugin::Recipient>,
 ) -> Result<(), error::EncryptError> {
     if let Ok(pk) = s.parse::<age::x25519::Recipient>() {
@@ -93,7 +93,7 @@ fn parse_recipient(
 fn read_recipients_list<R: BufRead>(
     filename: &str,
     buf: R,
-    recipients: &mut Vec<Box<dyn Recipient>>,
+    recipients: &mut Vec<Box<dyn Recipient + Send>>,
     plugin_recipients: &mut Vec<plugin::Recipient>,
 ) -> io::Result<()> {
     for (line_number, line) in buf.lines().enumerate() {
@@ -130,8 +130,8 @@ fn read_recipients(
     recipients_file_strings: Vec<String>,
     identity_strings: Vec<String>,
     max_work_factor: Option<u8>,
-) -> Result<Vec<Box<dyn Recipient>>, error::EncryptError> {
-    let mut recipients: Vec<Box<dyn Recipient>> = vec![];
+) -> Result<Vec<Box<dyn Recipient + Send>>, error::EncryptError> {
+    let mut recipients: Vec<Box<dyn Recipient + Send>> = vec![];
     let mut plugin_recipients: Vec<plugin::Recipient> = vec![];
     let mut plugin_identities: Vec<plugin::Identity> = vec![];