From 0a538fc564cf04916ae67fe2a2b7aa4056d607c7 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Fri, 22 Jan 2021 11:31:05 +0100
Subject: sq: Fix building against sequoia-openpgp 1.0.0.

---
 sq/src/commands/keyring.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'sq')

diff --git a/sq/src/commands/keyring.rs b/sq/src/commands/keyring.rs
index a7650907..2f30da75 100644
--- a/sq/src/commands/keyring.rs
+++ b/sq/src/commands/keyring.rs
@@ -257,7 +257,14 @@ fn split(input: &mut (dyn io::Read + Sync + Send), prefix: &str, binary: bool)
         if binary {
             cert.as_tsk().serialize(&mut sink)?;
         } else {
-            cert.as_tsk().armored().serialize(&mut sink)?;
+            use sequoia_openpgp::serialize::stream::{Message, Armorer};
+            let message = Message::new(sink);
+            let mut message = Armorer::new(message)
+            // XXX: should detect kind, see above
+                .kind(sequoia_openpgp::armor::Kind::PublicKey)
+                .build()?;
+            cert.as_tsk().serialize(&mut message)?;
+            message.finalize()?;
         }
     }
     Ok(())
-- 
cgit v1.2.3