openpgp: Fix Encryptor's lifetime parameter.

  - `Encryptor` uses a single lifetime for two fields, which is too
    restrictive in some situations.

  - To avoid breaking the API, introduce `Encryptor2`, which is just
    `Encryptor` renamed, and with an added lifetime parameter, and make
    `Encryptor` a thin wrapper around `Encryptor2`.

  - Deprecate `Encryptor`.

  - See #1028.

1 files changed, 2 insertions, 2 deletions

diff --git a/autocrypt/src/lib.rs b/autocrypt/src/lib.rs
index d75649da..b76c4208 100644
--- a/autocrypt/src/lib.rs
+++ b/autocrypt/src/lib.rs
@@ -37,7 +37,7 @@ use openpgp::parse::{
 };
 use openpgp::serialize::Serialize;
 use openpgp::serialize::stream::{
-    Message, LiteralWriter, Encryptor,
+    Message, LiteralWriter, Encryptor2,
 };
 use openpgp::crypto::Password;
 use openpgp::policy::Policy;
@@ -526,7 +526,7 @@ impl AutocryptSetupMessage {
         {
             // Passphrase-Format header with value numeric9x4
             let m = Message::new(&mut armor_writer);
-            let m = Encryptor::with_passwords(
+            let m = Encryptor2::with_passwords(
                 m, vec![self.passcode.clone().unwrap()]).build()?;
 
             let m = LiteralWriter::new(m).build()?;