more sigs

1 files changed, 9 insertions, 4 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 58868b6..3897ef5 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -4,8 +4,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DeriveFunctor #-}
 {-# LANGUAGE DoAndIfThenElse #-}
-{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE KindSignatures #-}
 module KeyRing
     ( InputFile(..)
     , backsig
@@ -196,7 +194,7 @@ initializer (MutableRef x) = x
 initializer _              = Nothing
 
 getUsage ::
-  forall (m :: * -> *). MonadPlus m => FileType -> m UsageTag
+  MonadPlus m => FileType -> m UsageTag
 getUsage (PEMFile usage) = return usage
 getUsage _               = mzero
 
@@ -1653,7 +1651,7 @@ runKeyRing operation = do
 
     return ret
 
-
+parseOptionFile :: FilePath -> IO [String]
 parseOptionFile fname = do
     xs <- fmap lines (readFile fname)
     let ys = filter notComment xs
@@ -1705,20 +1703,27 @@ getHomeDir protohome = do
 
 #if MIN_VERSION_base(4,6,0)
 #else
+lookupEnv :: String -> IO (Maybe String) 
 lookupEnv var =
     handleIO_ (return Nothing) $ fmap Just (getEnv var)
 #endif
 
+isKey :: Packet -> Bool
 isKey (PublicKeyPacket {}) = True
 isKey (SecretKeyPacket {}) = True
 isKey _                    = False
 
+isUserID :: Packet -> Bool
 isUserID (UserIDPacket {}) = True
 isUserID _                 = False
 
+isTrust :: Packet -> Bool
 isTrust (TrustPacket {}) = True
 isTrust _                = False
 
+sigpackets ::
+  Monad m =>
+  Word8 -> [SignatureSubpacket] -> [SignatureSubpacket] -> m Packet
 sigpackets typ hashed unhashed = return $
     signaturePacket
         4 -- version