1 files changed, 11 insertions, 1 deletions

diff --git a/lib/PEM.hs b/lib/PEM.hs
index e07b3d4..fd2fe98 100644
--- a/lib/PEM.hs
+++ b/lib/PEM.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP #-}
 module PEM where
 
 import Data.Monoid
@@ -6,9 +7,14 @@ import qualified Data.ByteString.Lazy as LW
 import qualified Data.ByteString.Lazy.Char8 as L
 import Control.Monad
 import Control.Applicative
+#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 ScanningParser
-
+import FunctorToMaybe
 data PEMBlob = PEMBlob { pemType :: L.ByteString
                        , pemBlob :: L.ByteString
                        }
@@ -28,7 +34,11 @@ pemParser mtyp = ScanningParser (maybe fndany fndtyp mtyp) pbdy
     pbdy typ xs = (mblob, drop 1 rs)
      where
         (ys,rs) = span (/="-----END " <> typ <> "-----") xs
+#if defined(VERSION_memory)
+        mblob = PEMBlob typ <$> LW.fromStrict <$> (functorToMaybe $ convertFromBase Base64 $ L.toStrict dta)
+#elif defined(VERSION_dataenc)
         mblob = PEMBlob typ <$> LW.pack <$> Base64.decode (L.unpack dta)
+#endif
         dta = case ys of
                 []        -> ""
                 dta_lines -> L.concat dta_lines