openpgp: Change Cert::into_packets to not drop any information.

  - Change `Cert::into_packets` to return the underlying packets.
    That is don't drop secret key material like `Cert::serialize`
    does.

1 files changed, 15 insertions, 3 deletions

diff --git a/openpgp/tests/for-each-artifact.rs b/openpgp/tests/for-each-artifact.rs
index 014bf18d..5aa23881 100644
--- a/openpgp/tests/for-each-artifact.rs
+++ b/openpgp/tests/for-each-artifact.rs
@@ -76,11 +76,23 @@ mod for_each_artifact {
             assert_eq!(v, w,
                        "Serialize and SerializeInto disagree on {:?}", p);
 
-            // Check that Cert::into_packets() and Cert::to_vec()
-            // agree.
+            // Check that
+            // Cert::strip_secret_key_material().into_packets() and
+            // Cert::to_vec() agree.  (Cert::into_packets() returns
+            // secret keys if secret key material is present;
+            // Cert::to_vec only ever returns public keys.)
             let v = p.to_vec()?;
             let mut buf = Vec::new();
-            for p in p.clone().into_packets() {
+            for p in p.clone().strip_secret_key_material().into_packets() {
+                p.serialize(&mut buf)?;
+            }
+            assert_eq!(buf, v);
+
+            // Check that Cert::into_packets() and
+            // Cert::as_tsk().to_vec() agree.
+            let v = p.as_tsk().to_vec()?;
+            let mut buf = Vec::new();
+            for p in p.into_packets() {
                 p.serialize(&mut buf)?;
             }
             assert_eq!(buf, v);