Skip to content
Browse files

Fixed breakage on GHC 6.10.1. And now requires 6.10.1...

darcs-hash:20090114142656-62b54-fef56bea6e8ec74f2082b832a75b5e1fa1543e80.gz
  • Loading branch information...
1 parent c7fabb4 commit 57c01c2dec0d89ab7b58e4adf51c18db3550d265 @phonohawk committed Jan 14, 2009
Showing with 28 additions and 7 deletions.
  1. +5 −5 HsOpenSSL.cabal
  2. +2 −1 NEWS
  3. +1 −0 OpenSSL/BN.hsc
  4. +1 −1 OpenSSL/PEM.hsc
  5. +19 −0 tests/Base64.hs
View
10 HsOpenSSL.cabal
@@ -5,15 +5,15 @@ Description:
generate RSA and DSA keys, read and write PEM files, generate
message digests, sign and verify messages, encrypt and decrypt
messages.
-Version: 0.4.2
+Version: 0.5
License: PublicDomain
License-File: COPYING
Author: Adam Langley <agl at imperialviolet.org>, PHO <pho at cielonegro.org>
Maintainer: PHO <pho at cielonegro.org>
Stability: experimental
-Homepage: http://ccm.sherry.jp/HsOpenSSL/
+Homepage: http://cielonegro.org/HsOpenSSL/
Category: Cryptography
-Tested-With: GHC == 6.8.1
+Tested-With: GHC == 6.10.1
Cabal-Version: >= 1.2
Build-Type: Configure
@@ -38,13 +38,13 @@ flag splitBase
Library
if flag(splitBase)
- build-depends: base >= 3, bytestring, time >= 1.1.1, old-locale, network>=2.1.0.0
+ build-depends: base >= 3, bytestring, ghc-prim, integer, time >= 1.1.1, old-locale, network>=2.1.0.0
else
build-depends: base < 3, time >= 1.1.1
--PkgConfig-Depends: openssl >= 0.9.7l
-- We really should use this instead of the configure script but
- -- Cabal 1.2.2.0 can't handle the weird version scheme of OpenSSL.
+ -- Cabal 1.6.0.1 can't handle this weird version scheme of OpenSSL.
Exposed-Modules:
OpenSSL
View
3 NEWS
@@ -1,5 +1,6 @@
-Changes from 0.4.2 to ?????
+Changes from 0.4.2 to 0.5
___________________________
+* Fixed breakage on GHC 6.10.1. And now requires 6.10.1...
* Applied a patch by Taru Karttunen:
- Add pkcs5_pbkdf2_hmac_sha1 to OpenSSL.EVP.Digest
View
1 OpenSSL/BN.hsc
@@ -54,6 +54,7 @@ import Foreign.C.Types
import GHC.Base
import GHC.Num
import GHC.Prim
+import GHC.Integer.Internals
import GHC.IOBase (IO(..))
#endif
View
2 OpenSSL/PEM.hsc
@@ -108,7 +108,7 @@ callPasswordCB cb buf bufLen rwflag _
return passLen
in
try `catch` \ exc ->
- do hPutStrLn stderr $ show exc
+ do hPutStrLn stderr (show (exc :: SomeException))
return 0 -- zero indicates an error
where
failForTooLongPassword :: Int -> IO a
View
19 tests/Base64.hs
@@ -9,13 +9,32 @@ import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as BSL
import OpenSSL.EVP.Base64
+{-
+ Comment by PHO:
+
+ These instance declarations now seem to be part of
+ Data.ByteString. What should we do then?
+
+ Base64.hs:12:9:
+ Duplicate instance declarations:
+ instance IsString BS.ByteString -- Defined at Base64.hs:12:9-30
+ instance IsString BS.ByteString -- Defined in Data.ByteString.Char8
+
+ Base64.hs:17:9:
+ Duplicate instance declarations:
+ instance IsString BSL.ByteString -- Defined at Base64.hs:17:9-31
+ instance IsString BSL.ByteString
+ -- Defined in Data.ByteString.Lazy.Char8
+-}
+{-
instance IsString BS.ByteString where
fromString = BS.pack . map (fromIntegral . ord)
-- Note that this instance packs each charactor as a separate lazy chunk.
-- This is to stress the lazy code - not because it's a good idea generally
instance IsString BSL.ByteString where
fromString = BSL.fromChunks . map (BS.singleton . fromIntegral . ord)
+-}
encodeTests :: [(BS.ByteString, BS.ByteString)]
encodeTests =

0 comments on commit 57c01c2

Please sign in to comment.
Something went wrong with that request. Please try again.