From 28d0231ce5373747cae1dbc97f988866540872ef Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Mon, 25 Nov 2019 12:48:32 +0100
Subject: openpgp: Specialize key iterator to return Key<SecretParts, _>.

  - Once KeyIter::secret or KeyIter::unencrypted_secret is called,
    change the iterator type to iterate over &Key<SecretParts, _>.

  - Fixes #384.
---
 openpgp/examples/notarize.rs      | 4 ++--
 openpgp/examples/sign-detached.rs | 4 ++--
 openpgp/examples/sign.rs          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'openpgp/examples')

diff --git a/openpgp/examples/notarize.rs b/openpgp/examples/notarize.rs
index fc161373..93ca53e1 100644
--- a/openpgp/examples/notarize.rs
+++ b/openpgp/examples/notarize.rs
@@ -28,7 +28,7 @@ fn main() {
             .expect("Failed to read key");
         let mut n = 0;
 
-        for (_, _, key) in tsk.keys_valid().signing_capable().secret(true) {
+        for (_, _, key) in tsk.keys_valid().signing_capable().secret() {
             keys.push({
                 let mut key = key.clone();
                 if key.secret().expect("filtered").is_encrypted() {
@@ -41,7 +41,7 @@ fn main() {
                         .expect("decryption failed");
                 }
                 n += 1;
-                key.mark_parts_secret().unwrap().into_keypair().unwrap()
+                key.into_keypair().unwrap()
             });
         }
 
diff --git a/openpgp/examples/sign-detached.rs b/openpgp/examples/sign-detached.rs
index 54c9ceef..8d5f9cfa 100644
--- a/openpgp/examples/sign-detached.rs
+++ b/openpgp/examples/sign-detached.rs
@@ -24,7 +24,7 @@ fn main() {
             .expect("Failed to read key");
         let mut n = 0;
 
-        for (_, _, key) in tsk.keys_valid().signing_capable().secret(true) {
+        for (_, _, key) in tsk.keys_valid().signing_capable().secret() {
             keys.push({
                 let mut key = key.clone();
                 if key.secret().expect("filtered").is_encrypted() {
@@ -37,7 +37,7 @@ fn main() {
                         .expect("decryption failed");
                 }
                 n += 1;
-                key.mark_parts_secret().unwrap().into_keypair().unwrap()
+                key.into_keypair().unwrap()
             });
         }
 
diff --git a/openpgp/examples/sign.rs b/openpgp/examples/sign.rs
index ec80e87f..8ba0b018 100644
--- a/openpgp/examples/sign.rs
+++ b/openpgp/examples/sign.rs
@@ -23,7 +23,7 @@ fn main() {
             .expect("Failed to read key");
         let mut n = 0;
 
-        for (_, _, key) in tsk.keys_valid().signing_capable().secret(true) {
+        for (_, _, key) in tsk.keys_valid().signing_capable().secret() {
             keys.push({
                 let mut key = key.clone();
                 if key.secret().expect("filtered").is_encrypted() {
@@ -36,7 +36,7 @@ fn main() {
                         .expect("decryption failed");
                 }
                 n += 1;
-                key.mark_parts_secret().unwrap().into_keypair().unwrap()
+                key.into_keypair().unwrap()
             });
         }
 
-- 
cgit v1.2.3