Replaced dataenc with memory.

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index ef7b913..a134680 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -26,7 +26,12 @@ import System.Posix.User
 import System.Process
 import System.Posix.Files
 import qualified Data.Traversable as T (mapM)
+#if defined(VERSION_memory)
+import qualified Data.ByteString.Char8 as S8
+import Data.ByteArray.Encoding
+#elif defined(VERSION_dataenc)
 import qualified Codec.Binary.Base64 as Base64
+#endif
 import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString.Lazy.Char8 as Char8
 import qualified Data.Map.Strict as Map
@@ -146,7 +151,7 @@ importAndRefresh root cmn = do
                         ( encode $ Message [mk { is_subkey = False }] )
         -}
         master_un <- (\k -> k { is_subkey = False }) <$> generateKey (GenRSA $ 4096 `div` 8 )
-        let default_cipher = (CAST5, IteratedSaltedS2K SHA1 4073382889203176146 7864320)
+        let default_cipher = (CAST5 {- AES128 -}, IteratedSaltedS2K SHA1 4073382889203176146 7864320)
             ctx = InputFileContext secring pubring
             passwordop = KeyRingOperation
                             { opFiles = Map.empty
@@ -452,7 +457,11 @@ sortOn f =
 pemFromPacket k = do
     let rsa = pkcs8 . fromJust $ rsaKeyFromPacket k
         der = encodeASN1 DER (toASN1 rsa [])
+#if defined(VERSION_memory)
+        qq  = S8.unpack $ convertToBase Base64 (L.toStrict der)
+#elif defined(VERSION_dataenc)
         qq  = Base64.encode (L.unpack der)
+#endif
     return $
         writePEM "PUBLIC KEY" qq -- ("TODO "++show keyspec)