KeyRing.hs imports PEM and TimeUtil

1 files changed, 3 insertions, 8 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index b87b76c..377e6e2 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -108,7 +108,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 ( getPOSIXTime, POSIXTime )
+import Data.Time.Clock.POSIX ( POSIXTime )
 import Data.Bits ( Bits )
 import Data.Text.Encoding ( encodeUtf8 )
 import qualified Data.Map as Map
@@ -150,6 +150,8 @@ import qualified Data.ByteString.Lazy.Char8 as Char8
 
 
 
+import TimeUtil
+import PEM
 import qualified Hosts
 import qualified CryptoCoins
 import Base58
@@ -1417,10 +1419,6 @@ readKeyFromFile False "PEM" fname = do
             }
 readKeyFromFile is_public fmt filename = error ("unimplemented key type: "++fmt)
 
-data PEMBlob = PEMBlob { pemType :: ByteString
-                       , pemBlob :: ByteString
-                       }
-
 extractPEM :: ByteString -> ByteString -> Maybe ByteString
 extractPEM typ pem = if L.null blob then Nothing else Just blob
  where
@@ -2460,9 +2458,6 @@ readPacketsFromFile ctx fname = do
     return $ decode input
 #endif
 
-now :: IO Integer
-now = floor <$> Data.Time.Clock.POSIX.getPOSIXTime
-
 signature_time :: SignatureOver -> Word32
 signature_time ov = case if null cs then ds else cs of
                                 [] -> minBound