crypton-x509-system 1.9.0 → 1.10.0

raw patch · 6 files changed

+13/−12 lines, 6 filesdep ~crypton-x509dep ~crypton-x509-storePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: crypton-x509, crypton-x509-store

API changes (from Hackage documentation)

Files

ChangeLog.md +5/−0
System/X509/Common.hs +1/−2
System/X509/MacOS.hs +0/−1
System/X509/Unix.hs +2/−3
System/X509/Win32.hs +2/−3
crypton-x509-system.cabal +3/−3

ChangeLog.md view

@@ -1,5 +1,10 @@ # ChangeLog for crypton-x509-system +## 1.10.0++* Follow the breaking change in `crypton-x509` 1.10.0+  [#35](https://github.com/kazu-yamamoto/crypton-certificate/pull/35)+ ## 1.9.0  * Using "ram" instead of "memory"

System/X509/Common.hs view

@@ -4,8 +4,7 @@ where  import Data.Foldable (asum)-import Data.Maybe (catMaybes, fromMaybe)-import Data.Monoid (mconcat)+import Data.Maybe (fromMaybe) import Data.X509.CertificateStore import System.Environment (lookupEnv)

System/X509/MacOS.hs view

@@ -2,7 +2,6 @@     getSystemCertificateStore, ) where -import Control.Applicative import qualified Data.ByteString.Lazy as LBS import Data.Either import Data.PEM (PEM (..), pemParseLBS)

System/X509/Unix.hs view

@@ -19,11 +19,10 @@ import System.Environment (getEnv) import System.X509.Common (maybeSSLCertEnvOr) -import Control.Applicative ((<$>)) import qualified Control.Exception as E+import qualified System.IO.Error as E  import Data.Maybe (catMaybes)-import Data.Monoid (mconcat)  defaultSystemPaths :: [FilePath] defaultSystemPaths =@@ -43,7 +42,7 @@         (mconcat . catMaybes <$> (getSystemPaths >>= mapM readCertificateStore))  getSystemPaths :: IO [FilePath]-getSystemPaths = E.catch ((: []) <$> getEnv envPathOverride) inDefault+getSystemPaths = E.catchIOError ((: []) <$> getEnv envPathOverride) inDefault   where     inDefault :: E.IOException -> IO [FilePath]     inDefault _ = return defaultSystemPaths

System/X509/Win32.hs view

@@ -10,8 +10,7 @@ import Foreign.Ptr import Foreign.Storable -import Control.Applicative-import Control.Exception (catch)+import qualified Control.Exception as E import Control.Monad (when)  import qualified Data.ByteString.Internal as B@@ -72,4 +71,4 @@                     case ecert of                         Left _ -> loop st r                         Right cert -> (cert :) <$> (loop st r)-                    `catch` \(_ :: ASN1Error) -> loop st r+                    `E.catch` \(_ :: ASN1Error) -> loop st r

crypton-x509-system.cabal view

@@ -1,6 +1,6 @@ cabal-version:      >=1.10 name:               crypton-x509-system-version:            1.9.0+version:            1.10.0 license:            BSD3 license-file:       LICENSE copyright:          Vincent Hanquez <vincent@snarc.org>@@ -39,8 +39,8 @@         filepath,         process,         crypton-pem >=0.2.4 && <0.4,-        crypton-x509 >=1.9.0 && <1.10,-        crypton-x509-store >=1.9.0 && <1.10+        crypton-x509 >=1.10 && <1.11,+        crypton-x509-store >=1.10 && <1.11      if os(windows)         exposed-modules: System.X509.Win32