Fix to work with x509>=1.5, probably breaks 1.4

3 files changed, 11 insertions, 2 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 857c755..2deb12b 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -145,8 +145,13 @@ import qualified Data.Text as T ( Text, unpack, pack,
 import qualified System.Posix.Types as Posix
 import System.Posix.Files ( modificationTime, getFileStatus, getFdStatus
         , setFileCreationMask, setFileTimes )
+#if MIN_VERSION_x509(1,5,0)
+import Data.Hourglass.Types
+import Data.Hourglass
+#endif
 #if MIN_VERSION_unix(2,7,0)
 import System.Posix.Files ( setFdTimesHiRes )
+import Foreign.C.Types ( CTime(..), CLong, CInt(..) )
 #else
 import Foreign.C.Types ( CTime(..), CLong, CInt(..) )
 import Foreign.Marshal.Array ( withArray )
@@ -1472,7 +1477,9 @@ parseCertBlob comp bs = do
     let asn1' = drop 2 asn1
     cert <- either (const Nothing) (Just . fst) (fromASN1 asn1')
     let _ = cert :: X509.Certificate
-        (notBefore,_) = X509.certValidity cert
+        notBefore :: UTCTime
+        notBefore =  toUTC ( timeFromElapsedP (timeGetElapsedP vincentTime) :: CTime) -- nanoToUTCTime nano
+            where (vincentTime,_) = X509.certValidity cert
     case X509.certPubKey cert of
         X509.PubKeyRSA key -> do
             let withoutkey =
diff --git a/TimeUtil.hs b/TimeUtil.hs
index 9c0a2b5..9035e50 100644
--- a/TimeUtil.hs
+++ b/TimeUtil.hs
@@ -4,6 +4,7 @@ module TimeUtil
     ( now
     , IsTime(..)
     , fromTime
+    , toUTC
     , parseRFC2822
     , printRFC2822
     , dateParser
diff --git a/kiki.cabal b/kiki.cabal
index 944ae64..98a084b 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -22,7 +22,8 @@ Executable kiki
                      bytestring -any, openpgp (>=0.6.1), binary -any,
                      unix, time, 
                      containers -any, process -any, filepath -any,
-                     network -any, old-locale -any, zlib -any
+                     network -any, old-locale -any, zlib -any,
+                     hourglass -any
     ghc-options:     -O2 -fwarn-unused-binds -fwarn-unused-imports
     c-sources: dotlock.c