diff --git a/ChangeLog.md b/ChangeLog.md new file mode 100644 --- /dev/null +++ b/ChangeLog.md @@ -0,0 +1,9 @@ +# ChangeLog for crypton-x509-validation + +## 1.8.0 + +* Depend on package `time-hourglass`, rather than `hourglass`. Date and + time-related types and classes are now those from the former package. + [#18](https://github.com/kazu-yamamoto/crypton-certificate/pull/18) +* Depend on package `crypton-asn1-types >= 0.4.1` rather than `asn1-types`. + ASN.1-related types and classes are now those from the former package. diff --git a/Data/X509/Validation.hs b/Data/X509/Validation.hs --- a/Data/X509/Validation.hs +++ b/Data/X509/Validation.hs @@ -55,8 +55,8 @@ import Data.X509.Validation.Fingerprint import Data.X509.Validation.Signature import Data.X509.Validation.Types -import System.Hourglass import Text.Read (readMaybe) +import Time.System -- | Possible reason of certificate and chain failure. -- diff --git a/Tests/Tests.hs b/Tests/Tests.hs --- a/Tests/Tests.hs +++ b/Tests/Tests.hs @@ -20,7 +20,7 @@ import qualified Data.ByteString as BS import Data.Hourglass -import System.Hourglass +import Time.System import Test.Tasty import Test.Tasty.HUnit @@ -863,19 +863,73 @@ [NameMismatch "266.0.0.1"] -- 266 read in Word8 is 10 , testSubjectAltNameIP res - (BS.pack [0x20, 0x01, 0x0d, 0xb8, 0x85, 0xa3, 0, 0, 0, 0, 0x8a, 0x2e, 0x03, 0x70, 0x73, 0x34]) + ( BS.pack + [ 0x20 + , 0x01 + , 0x0d + , 0xb8 + , 0x85 + , 0xa3 + , 0 + , 0 + , 0 + , 0 + , 0x8a + , 0x2e + , 0x03 + , 0x70 + , 0x73 + , 0x34 + ] + ) "2001:0db8:85a3:0000:0000:8a2e:0370:7334" True [] , testSubjectAltNameIP res - (BS.pack [0x20, 0x01, 0x0d, 0xb8, 0x85, 0xa3, 0, 0, 0, 0, 0x8a, 0x2e, 0x03, 0x70, 0x73, 0x34]) + ( BS.pack + [ 0x20 + , 0x01 + , 0x0d + , 0xb8 + , 0x85 + , 0xa3 + , 0 + , 0 + , 0 + , 0 + , 0x8a + , 0x2e + , 0x03 + , 0x70 + , 0x73 + , 0x34 + ] + ) "2001:0db8:85a3::8a2e:0370:7334" True [] , testSubjectAltNameIP res - (BS.pack [0x20, 0x01, 0x0d, 0xb8, 0x85, 0xa3, 0, 0, 0, 0, 0x8a, 0x2e, 0x03, 0x70, 0x73, 0x34]) + ( BS.pack + [ 0x20 + , 0x01 + , 0x0d + , 0xb8 + , 0x85 + , 0xa3 + , 0 + , 0 + , 0 + , 0 + , 0x8a + , 0x2e + , 0x03 + , 0x70 + , 0x73 + , 0x34 + ] + ) "2001:0db8:85a3:0:0:8a2e:0370:7334" True [] diff --git a/crypton-x509-validation.cabal b/crypton-x509-validation.cabal --- a/crypton-x509-validation.cabal +++ b/crypton-x509-validation.cabal @@ -1,63 +1,68 @@ -Name: crypton-x509-validation -version: 1.6.14 -Description: X.509 Certificate and CRL validation. please see README -License: BSD3 -License-file: LICENSE -Copyright: Vincent Hanquez -Author: Vincent Hanquez -Maintainer: Kazu Yamamoto -Synopsis: X.509 Certificate and CRL validation -Build-Type: Simple -Category: Data -stability: experimental -Homepage: https://github.com/kazu-yamamoto/crypton-certificate -Cabal-Version: >= 1.10 +cabal-version: >=1.10 +name: crypton-x509-validation +version: 1.8.0 +license: BSD3 +license-file: LICENSE +copyright: Vincent Hanquez +maintainer: Kazu Yamamoto +author: Vincent Hanquez +stability: experimental +homepage: https://github.com/kazu-yamamoto/crypton-certificate +synopsis: X.509 Certificate and CRL validation +description: X.509 Certificate and CRL validation. please see README +category: Data +build-type: Simple +extra-source-files: ChangeLog.md -Library - Default-Language: Haskell2010 - Build-Depends: base >= 3 && < 5 - , bytestring - , memory - , mtl - , containers - , hourglass - , data-default - , pem >= 0.1 - , asn1-types >= 0.3 && < 0.4 - , asn1-encoding >= 0.9 && < 0.10 - , crypton-x509 >= 1.7.5 - , crypton-x509-store >= 1.6 - , crypton >= 0.24 - , iproute >= 1.2.2 - Exposed-modules: Data.X509.Validation - Other-modules: Data.X509.Validation.Signature - Data.X509.Validation.Fingerprint - Data.X509.Validation.Cache - Data.X509.Validation.Types - ghc-options: -Wall +source-repository head + type: git + location: https://github.com/kazu-yamamoto/crypton-certificate + subdir: x509-validation -Test-Suite test-x509-validation - Default-Language: Haskell2010 - type: exitcode-stdio-1.0 - hs-source-dirs: Tests - Main-is: Tests.hs - Other-modules: Certificate - Build-Depends: base >= 3 && < 5 - , bytestring - , memory - , data-default - , tasty - , tasty-hunit - , hourglass - , asn1-types - , asn1-encoding - , crypton-x509 >= 1.7.1 - , crypton-x509-store - , crypton-x509-validation - , crypton - ghc-options: -Wall +library + exposed-modules: Data.X509.Validation + other-modules: + Data.X509.Validation.Signature + Data.X509.Validation.Fingerprint + Data.X509.Validation.Cache + Data.X509.Validation.Types -source-repository head - type: git - location: https://github.com/kazu-yamamoto/crypton-certificate - subdir: x509-validation + default-language: Haskell2010 + ghc-options: -Wall + build-depends: + base >=3 && <5, + bytestring, + containers, + crypton >=0.24, + crypton-asn1-types >=0.4.1 && <0.5, + crypton-asn1-encoding >=0.10.0 && <0.11, + crypton-pem >=0.2.4 && <0.4, + crypton-x509 >=1.8.0, + crypton-x509-store >=1.8.0, + data-default, + iproute >=1.2.2, + memory, + mtl, + time-hourglass + +test-suite test-x509-validation + type: exitcode-stdio-1.0 + main-is: Tests.hs + hs-source-dirs: Tests + other-modules: Certificate + default-language: Haskell2010 + ghc-options: -Wall + build-depends: + base >=3 && <5, + bytestring, + crypton, + crypton-asn1-encoding, + crypton-asn1-types, + crypton-x509 >=1.7.1, + crypton-x509-store, + crypton-x509-validation, + data-default, + memory, + tasty, + tasty-hunit, + time-hourglass