1 files changed, 19 insertions, 8 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index 3a4bdc6..515faf6 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -112,8 +112,10 @@ import Debug.Trace
 #endif
 import Network.Socket -- (SockAddr)
 import qualified Data.ByteString.Lazy.Char8 as Char8
-import Compat
+import qualified Codec.Encryption.OpenPGP.ASCIIArmor as ASCIIArmor
+import Codec.Encryption.OpenPGP.ASCIIArmor.Types
 
+import Compat
 import TimeUtil
 import PEM
 import ScanningParser
@@ -744,6 +746,14 @@ isauth rt keydata = dont_have keydata && maybe False (`has_good_sig` keydata) wk
                             guard $ matchSpec (KeyGrip fp) elm
                             return $ keyPacket elm
 
+mkarmor :: Access -> L.ByteString -> [Armor]
+mkarmor access bs = [Armor typ [] bs]
+ where
+     typ = case access of
+            Pub        -> ArmorPublicKeyBlock
+            Sec        -> ArmorPrivateKeyBlock
+            AutoAccess -> ArmorPrivateKeyBlock -- I don't know, so don't make it look sharable.
+
 writeRingKeys :: KeyRingOperation -> KeyRingRuntime -> Map.Map InputFile Message
                     -> [(FilePath,KikiReportAction)]
                 {-
@@ -810,17 +820,18 @@ writeRingKeys krd rt {- db wk secring pubring -} unspilled report_manips = do
             go (ws,report) ((f,stream),(new_packets,x)) = (ws++writes, report++(items <$> new_packets))
               where
                 mutable = isMutable stream
-                encoding = case typ stream of PGPPackets e -> e
-                                              _            -> BinaryPackets
-                writes | mutable   = [(encoding,f,x)]
+                writes | mutable   = [(stream,f,x)]
                        | otherwise = []
                 items c = ( concat $ resolveInputFile ctx f
                           , bool MissingPacket NewPacket mutable $ showPacket (packet c)
                           )
-    forM_ towrites $ \(encoding,f,xs) -> case encoding of
-        BinaryPackets -> writeInputFileL ctx f $ encode $ Message $ map packet xs
-        AsciiArmor    -> hPutStrLn stderr $ "Not writing " ++ show (resolveInputFile ctx f)
-                                            ++ " because ascii-armor is not implemented. (TODO)"
+    forM_ towrites $ \(stream,f,xs) -> do
+        let encoding = case typ stream of PGPPackets e -> e
+                                          _            -> BinaryPackets
+            enc = case encoding of
+                BinaryPackets -> id
+                AsciiArmor    -> ASCIIArmor.encodeLazy . mkarmor (access stream)
+        writeInputFileL ctx f $ enc $ encode $ Message $ map packet xs
     return $ KikiSuccess report