openpgp: Reduce the number of explicit key conversions.

2 files changed, 29 insertions, 20 deletions

diff --git a/guide/src/chapter_01.md b/guide/src/chapter_01.md
index 178e8e83..0c891aab 100644
--- a/guide/src/chapter_01.md
+++ b/guide/src/chapter_01.md
@@ -57,9 +57,10 @@ fn main() {
 #     -> openpgp::Result<()>
 # {
 #     // Get the keypair to do the signing from the Cert.
-#     let keypair = tsk.keys().with_policy(policy, None)
-#         .alive().revoked(false).for_signing().nth(0).unwrap()
-#         .key().clone().mark_parts_secret().unwrap().into_keypair()?;
+#     let keypair = tsk
+#         .keys().unencrypted_secret()
+#         .with_policy(policy, None).alive().revoked(false).for_signing()
+#         .nth(0).unwrap().key().clone().into_keypair()?;
 #
 #     // Start streaming an OpenPGP message.
 #     let message = Message::new(sink);
@@ -211,9 +212,10 @@ fn generate() -> openpgp::Result<openpgp::Cert> {
 #     -> openpgp::Result<()>
 # {
 #     // Get the keypair to do the signing from the Cert.
-#     let keypair = tsk.keys().with_policy(policy, None)
-#         .alive().revoked(false).for_signing().nth(0).unwrap()
-#         .key().clone().mark_parts_secret().unwrap().into_keypair()?;
+#     let keypair = tsk
+#         .keys().unencrypted_secret()
+#         .with_policy(policy, None).alive().revoked(false).for_signing()
+#         .nth(0).unwrap().key().clone().into_keypair()?;
 #
 #     // Start streaming an OpenPGP message.
 #     let message = Message::new(sink);
@@ -365,9 +367,10 @@ fn sign(policy: &dyn Policy,
     -> openpgp::Result<()>
 {
     // Get the keypair to do the signing from the Cert.
-    let keypair = tsk.keys().with_policy(policy, None)
-        .alive().revoked(false).for_signing().nth(0).unwrap()
-        .key().clone().mark_parts_secret().unwrap().into_keypair()?;
+    let keypair = tsk
+        .keys().unencrypted_secret()
+        .with_policy(policy, None).alive().revoked(false).for_signing()
+        .nth(0).unwrap().key().clone().into_keypair()?;
 
     // Start streaming an OpenPGP message.
     let message = Message::new(sink);
@@ -530,9 +533,10 @@ Verified data can be read from this using [`io::Read`].
 #     -> openpgp::Result<()>
 # {
 #     // Get the keypair to do the signing from the Cert.
-#     let keypair = tsk.keys().with_policy(policy, None)
-#         .alive().revoked(false).for_signing().nth(0).unwrap()
-#         .key().clone().mark_parts_secret().unwrap().into_keypair()?;
+#     let keypair = tsk
+#         .keys().unencrypted_secret()
+#         .with_policy(policy, None).alive().revoked(false).for_signing()
+#         .nth(0).unwrap().key().clone().into_keypair()?;
 # 
 #     // Start streaming an OpenPGP message.
 #     let message = Message::new(sink);
diff --git a/guide/src/chapter_02.md b/guide/src/chapter_02.md
index 88dfe1d7..1d55e6d9 100644
--- a/guide/src/chapter_02.md
+++ b/guide/src/chapter_02.md
@@ -134,11 +134,12 @@ fn main() {
 #         where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()>
 #     {
 #         // The encryption key is the first and only subkey.
-#         let key = self.secret.keys().with_policy(self.policy, None)
+#         let key = self.secret.keys().unencrypted_secret()
+#             .with_policy(self.policy, None)
 #             .for_transport_encryption().nth(0).unwrap().key().clone();
 #
 #         // The secret key is not encrypted.
-#         let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap();
+#         let mut pair = key.into_keypair().unwrap();
 #
 #         pkesks[0].decrypt(&mut pair, sym_algo)
 #             .and_then(|(algo, session_key)| decrypt(algo, &session_key))
@@ -283,11 +284,12 @@ fn generate() -> openpgp::Result<openpgp::Cert> {
 #         where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()>
 #     {
 #         // The encryption key is the first and only subkey.
-#         let key = self.secret.keys().with_policy(self.policy, None)
+#         let key = self.secret.keys().unencrypted_secret()
+#             .with_policy(self.policy, None)
 #             .for_transport_encryption().nth(0).unwrap().key().clone();
 #
 #         // The secret key is not encrypted.
-#         let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap();
+#         let mut pair = key.into_keypair().unwrap();
 #
 #         pkesks[0].decrypt(&mut pair, sym_algo)
 #             .and_then(|(algo, session_key)| decrypt(algo, &session_key))
@@ -432,11 +434,12 @@ fn encrypt(policy: &dyn Policy,
 #         where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()>
 #     {
 #         // The encryption key is the first and only subkey.
-#         let key = self.secret.keys().with_policy(self.policy, None)
+#         let key = self.secret.keys().unencrypted_secret()
+#             .with_policy(self.policy, None)
 #             .for_transport_encryption().nth(0).unwrap().key().clone();
 #
 #         // The secret key is not encrypted.
-#         let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap();
+#         let mut pair = key.into_keypair().unwrap();
 #
 #         pkesks[0].decrypt(&mut pair, sym_algo)
 #             .and_then(|(algo, session_key)| decrypt(algo, &session_key))
@@ -594,11 +597,13 @@ impl<'a> DecryptionHelper for Helper<'a> {
                   -> openpgp::Result<Option<openpgp::Fingerprint>>
         where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()>
     {
-        let key = self.secret.keys().with_policy(self.policy, None)
+        // The encryption key is the first and only subkey.
+        let key = self.secret.keys().unencrypted_secret()
+            .with_policy(self.policy, None)
             .for_transport_encryption().nth(0).unwrap().key().clone();
 
         // The secret key is not encrypted.
-        let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap();
+        let mut pair = key.into_keypair().unwrap();
 
         pkesks[0].decrypt(&mut pair, sym_algo)
             .and_then(|(algo, session_key)| decrypt(algo, &session_key))