Build against older libs

2 files changed, 21 insertions, 7 deletions

diff --git a/Data/OpenPGP/Util/DecryptSecretKey.hs b/Data/OpenPGP/Util/DecryptSecretKey.hs
index b3f5640..6bfc2af 100644
--- a/Data/OpenPGP/Util/DecryptSecretKey.hs
+++ b/Data/OpenPGP/Util/DecryptSecretKey.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 module Data.OpenPGP.Util.DecryptSecretKey where
 
 import qualified Data.OpenPGP as OpenPGP
@@ -6,7 +7,13 @@ import qualified Data.ByteString.Lazy as LZ
 import Data.Word (Word16)
 import Control.Monad (foldM)
 import Data.Binary (get,Binary,Get,encode)
+#if MIN_VERSION_binary(0,6,4)
 import Data.Binary.Get (runGetOrFail)
+#else
+import Control.Exception as Exception (handle,ErrorCall(..))
+import System.IO.Unsafe
+import Data.Binary.Get (runGet)
+#endif
 import Control.Applicative ( (<$>) )
 
 import Crypto.Hash.SHA1 as SHA1
@@ -69,16 +76,23 @@ decryptSecretKey pass k@(OpenPGP.SecretKeyPacket {
     checksum key = fromIntegral $
         BS.foldl' (\x y -> x + fromIntegral y) (0::Integer) key `mod` 65536
 
-    maybeGet :: (Binary a) => Get a -> LZ.ByteString -> Maybe a
-    maybeGet g bs = (\(_,_,x) -> x) <$> hush (runGetOrFail g bs)
+decryptSecretKey _ _ = Nothing
+
 
+#if MIN_VERSION_binary(0,6,4)
+maybeGet :: (Binary a) => Get a -> LZ.ByteString -> Maybe a
+maybeGet g bs = (\(_,_,x) -> x) <$> hush (runGetOrFail g bs)
+ where
     hush :: Either a b -> Maybe b
     hush (Left _) = Nothing
     hush (Right x) = Just x
+#else
+maybeGet :: (Binary a) => Get a -> LZ.ByteString -> Maybe a
+maybeGet g bs = unsafePerformIO $
+    handle (\(ErrorCall _)-> return Nothing) $ return . Just $ runGet g bs
+#endif
 
 
-decryptSecretKey _ _ = Nothing
-
 
 string2sdecrypt :: OpenPGP.SymmetricAlgorithm -> OpenPGP.S2K -> LZ.ByteString -> Enciphered -> LZ.ByteString
 string2sdecrypt OpenPGP.AES128 s2k s = withIV $ simpleUnCFB (string2key s2k s :: Vincent.AES128)
diff --git a/openpgp-util.cabal b/openpgp-util.cabal
index ca02709..8c0e44f 100644
--- a/openpgp-util.cabal
+++ b/openpgp-util.cabal
@@ -40,15 +40,15 @@ library
                 transformers,
                 bytestring,
                 time >= 1.4,
-                binary >= 0.6.4.0,
-                openpgp >= 0.6,
+                binary >= 0.5.1.1,
+                openpgp >= 0.4,
                 crypto-random >= 0.0.7,
                 cryptohash >= 0.9.1,
                 crypto-pubkey >= 0.2.3,
                 crypto-pubkey-types >= 0.4.1,
                 cipher-cast5 -any,
                 byteable,
-                crypto-cipher-types >= 0.0.9,
+                crypto-cipher-types >= 0.0.7,
                 cipher-blowfish,
                 cipher-aes >= 0.2.6