Added "encrypt" and "sign" keys to be generated.

2 files changed, 18 insertions, 16 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index e084fcd..8a23ff9 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -585,21 +585,21 @@ keyflags _ = Nothing
 
 data PGPKeyFlags =
     Special
-    | Vouch -- Signkey
-    | Sign
-    | VouchSign
-    | Communication
-    | VouchCommunication
-    | SignCommunication
-    | VouchSignCommunication
-    | Storage
-    | VouchStorage
-    | SignStorage
-    | VouchSignStorage
-    | Encrypt
-    | VouchEncrypt
-    | SignEncrypt
-    | VouchSignEncrypt
+    | Vouch                  -- 0001 C -- Signkey
+    | Sign                   -- 0010 S
+    | VouchSign              -- 0011
+    | Communication          -- 0100 E
+    | VouchCommunication     -- 0101
+    | SignCommunication      -- 0110
+    | VouchSignCommunication -- 0111
+    | Storage                -- 1000 E
+    | VouchStorage           -- 1001
+    | SignStorage            -- 1010
+    | VouchSignStorage       -- 1011
+    | Encrypt                -- 1100 E
+    | VouchEncrypt           -- 1101
+    | SignEncrypt            -- 1110
+    | VouchSignEncrypt       -- 1111
  deriving (Eq,Show,Read,Enum)
 
 
diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index c042540..90d1699 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -255,9 +255,11 @@ importAndRefresh root cmn = do
                                                          , initializer = NoCreate
                                                          , transforms = [] }
                                 _          -> strm { spill = KF_Match "tor" })
-                , ( Generate 1 (GenRSA (1024 `div` 8)), strm { spill = KF_Match "ipsec" })
+                , ( Generate 1 (GenRSA (2048 `div` 8)), strm { spill = KF_Match "ipsec" })
                 , ( ArgFile sshcpath, (peminfo 2048 "ssh-client") )
                 , ( ArgFile sshspath, (peminfo 2048 "ssh-server") )
+                , ( Generate 2 (GenRSA (4096 `div` 8)), strm { spill = KF_Match "encrypt" })
+                , ( Generate 3 (GenRSA (4096 `div` 8)), strm { spill = KF_Match "sign" })
                 ]
              , opPassphrases = withAgent $ pwds ++ do pfd <- maybeToList passfd
                                                       return $ PassphraseSpec Nothing Nothing pfd