x509 1.6.0 → 1.6.1
raw patch · 4 files changed
+14/−11 lines, 4 filesdep −directorydep −filepathdep −process
Dependencies removed: directory, filepath, process
Files
- Data/X509/CRL.hs +4/−4
- Data/X509/Cert.hs +7/−3
- Data/X509/DistinguishedName.hs +2/−0
- x509.cabal +1/−4
Data/X509/CRL.hs view
@@ -18,7 +18,7 @@ import Control.Applicative -import Data.Hourglass (DateTime)+import Data.Hourglass (DateTime, TimezoneOffset(..)) import Data.ASN1.Types import Data.X509.DistinguishedName@@ -54,7 +54,7 @@ Right (RevokedCertificate serial t (Extensions Nothing), xs) fromASN1 l = Left ("fromASN1: X509.RevokedCertificate: unknown format:" ++ show l) toASN1 (RevokedCertificate serial time _) = \xs ->- Start Sequence : IntVal serial : ASN1Time TimeGeneralized time Nothing : End Sequence : xs+ Start Sequence : IntVal serial : ASN1Time TimeGeneralized time (Just (TimezoneOffset 0)) : End Sequence : xs parseCRL :: ParseASN1 CRL parseCRL = do@@ -83,8 +83,8 @@ [IntVal $ crlVersion crl] ++ toASN1 (crlSignatureAlg crl) [] ++ toASN1 (crlIssuer crl) [] ++- [ASN1Time TimeGeneralized (crlThisUpdate crl) Nothing] ++- (maybe [] (\t -> [ASN1Time TimeGeneralized t Nothing]) (crlNextUpdate crl)) +++ [ASN1Time TimeGeneralized (crlThisUpdate crl) (Just (TimezoneOffset 0))] +++ (maybe [] (\t -> [ASN1Time TimeGeneralized t (Just (TimezoneOffset 0))]) (crlNextUpdate crl)) ++ [Start Sequence] ++ revoked ++ [End Sequence] ++
Data/X509/Cert.hs view
@@ -12,13 +12,13 @@ module Data.X509.Cert (Certificate(..)) where import Data.ASN1.Types-import Data.Hourglass (DateTime, TimezoneOffset(TimezoneOffset)) import Control.Applicative ((<$>), (<*>)) import Data.X509.Internal import Data.X509.PublicKey import Data.X509.AlgorithmIdentifier import Data.X509.DistinguishedName import Data.X509.ExtensionRaw+import Data.Hourglass data CertKeyUsage = CertKeyUsageDigitalSignature@@ -104,8 +104,12 @@ eAlgId = toASN1 (certSignatureAlg cert) [] eIssuer = toASN1 (certIssuerDN cert) [] (t1, t2) = certValidity cert- eValidity = asn1Container Sequence [ASN1Time TimeGeneralized t1 (Just (TimezoneOffset 0))- ,ASN1Time TimeGeneralized t2 (Just (TimezoneOffset 0))]+ eValidity = asn1Container Sequence [ASN1Time (timeType t1) t1 (Just (TimezoneOffset 0))+ ,ASN1Time (timeType t2) t2 (Just (TimezoneOffset 0))] eSubject = toASN1 (certSubjectDN cert) [] epkinfo = toASN1 (certPubKey cert) [] eexts = toASN1 (certExtensions cert) []+ timeType t =+ if t >= timeConvert (Date 2050 January 1)+ then TimeGeneralized+ else TimeUTC
Data/X509/DistinguishedName.hs view
@@ -30,6 +30,7 @@ | DnCountry -- ^ Country | DnOrganization -- ^ O | DnOrganizationUnit -- ^ OU+ | DnEmailAddress -- ^ Email Address (legacy) deriving (Show,Eq) instance OIDable DnElement where@@ -37,6 +38,7 @@ getObjectID DnCountry = [2,5,4,6] getObjectID DnOrganization = [2,5,4,10] getObjectID DnOrganizationUnit = [2,5,4,11]+ getObjectID DnEmailAddress = [1,2,840,113549,1,9,1] -- | Try to get a specific element in a 'DistinguishedName' structure getDnElement :: DnElement -> DistinguishedName -> Maybe ASN1CharacterString
x509.cabal view
@@ -1,5 +1,5 @@ Name: x509-Version: 1.6.0+Version: 1.6.1 Description: X509 reader and writer License: BSD3 License-file: LICENSE@@ -19,9 +19,6 @@ , memory , mtl , containers- , directory- , filepath- , process , hourglass , pem >= 0.1 && < 0.3 , asn1-types >= 0.3.0 && < 0.4