Take the date from the certificate when importing PEM files.

1 files changed, 4 insertions, 2 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 94039f6..e0994cf 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -113,7 +113,7 @@ import Data.ASN1.Types ( toASN1, ASN1Object, fromASN1
 import Data.ASN1.BitArray ( BitArray(..), toBitArray )
 import Data.ASN1.Encoding ( encodeASN1, encodeASN1', decodeASN1, decodeASN1' )
 import Data.ASN1.BinaryEncoding ( DER(..) )
-import Data.Time.Clock.POSIX ( POSIXTime, utcTimeToPOSIXSeconds, posixSecondsToUTCTime )
+import Data.Time.Clock.POSIX ( POSIXTime, utcTimeToPOSIXSeconds )
 import Data.Time.Clock ( UTCTime )
 import Data.Bits ( Bits )
 import Data.Text.Encoding ( encodeUtf8 )
@@ -1573,7 +1573,9 @@ doImport doDecrypt db (fname,subspec,ms,_) = do
                         { human_readable = False
                         , notation_name = "x509cert@"
                         , notation_value = Char8.unpack bs }
-                r <- doImportG doDecrypt db m0 (mkUsage tag:blobs) fname key
+                    datedKey = key { timestamp = fromTime $ minimum dates }
+                    dates = fromTime (timestamp key) : map pcertTimestamp certs
+                r <- doImportG doDecrypt db m0 (mkUsage tag:blobs) fname datedKey
                 try r $ \(db',report') -> do
                 return $ KikiSuccess (db',report++report')