Address interface changes and warnings in kiki.hs

1 files changed, 13 insertions, 35 deletions

diff --git a/kiki.hs b/kiki.hs
index 19d8beb..1e4f1e4 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -32,7 +32,6 @@ import qualified Data.ByteString      as S
 import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString.Lazy.Char8 as Char8
 import qualified Data.Map as Map
-import qualified Data.Text as T
 import Control.Arrow   (first,second)
 import Data.Binary.Get (runGet)
 import Data.Binary.Put (putWord32be,runPut,putByteString)
@@ -598,37 +597,6 @@ kiki_usage bSecret cmd = putStr $
                  ,"      5E24CD442AA6965D2012E62A905C24185D5379C2"
                  ]
 
-doAutosign rt kd@(KeyData k ksigs umap submap) = ops
- where
-    ops = map (\u -> InducerSignature u []) us
-    us = filter torStyle $ Map.keys umap
-    torStyle str = and [ uid_topdomain parsed == "onion"
-                        , uid_realname parsed `elem` ["","Anonymous"]
-                        , uid_user parsed == "root"
-                        , fmap (match . fst) (lookup (packet k) torbindings)
-                            == Just True ]
-      where parsed = parseUID str
-            match =  (==subdom) . take (fromIntegral len)
-            subdom0 = L.fromChunks [encodeUtf8 (uid_subdomain parsed)]
-            subdom = Char8.unpack subdom0
-            len = T.length (uid_subdomain parsed)
-            torbindings = getTorKeys (map packet $ flattenTop "" True kd)
-            getTorKeys pub = do
-                xs <- groupBindings pub
-                (_,(top,sub),us,_,_) <- xs
-                guard ("tor" `elem` us)
-                let torhash = fromMaybe "" $ derToBase32 <$> derRSA sub
-                return (top,(torhash,sub))
-
-            groupBindings pub = gs
-             where (_,bindings) = getBindings pub
-                   bindings' = accBindings bindings
-                   code (c,(m,s),_,_,_) = (fingerprint_material m,-c)
-                   ownerkey (_,(a,_),_,_,_) = a
-                   sameMaster (ownerkey->a) (ownerkey->b)
-                        = fingerprint_material a==fingerprint_material b
-                   gs = groupBy sameMaster (sortBy (comparing code) bindings')
-
 processArgs sargspec polyVariadicArgs defaultPoly args_raw = (sargs,margs)
     where
         (args,trail1) = break (=="--") args_raw
@@ -725,7 +693,9 @@ sync bExport bImport bSecret cmdarg args_raw = do
                                                        , spill = KF_Match usage
                                                        , typ = PEMFile
                                                        , access = Sec
-                                                       , initializer = cmd' })
+                                                       , initializer = cmd'
+                                                       , transforms = []
+                                                       } )
                         else if isNothing cmd'
                                 then ( ArgFile path
                                      , (buildStreamInfo KF_None PEMFile)
@@ -750,7 +720,8 @@ sync bExport bImport bSecret cmdarg args_raw = do
                                                , fill = rtyp
                                                , spill = KF_All
                                                , access = AutoAccess
-                                               , initializer = Nothing }
+                                               , initializer = Nothing
+                                               , transforms = [] }
         kikiOp = KeyRingOperation
             { opFiles = Map.fromList $
                 [ ( HomeSec, buildStreamInfo (if bSecret && bImport then KF_All
@@ -764,7 +735,10 @@ sync bExport bImport bSecret cmdarg args_raw = do
                 ++ if bSecret then pems else []
                 ++ if bSecret then walts else []
                 ++ hosts
-            , kManip = maybe noManip (const doAutosign) $ Map.lookup "--autosign" margs
+            , opPassphrases = do pfile <- maybeToList passfd
+                                 return $ PassphraseSpec Nothing Nothing pfile
+            , opTransforms = maybe [] (const [Autosign]) $ Map.lookup "--autosign" margs
+            , kManip = noManip
             , opHome = homespec
             }
 
@@ -856,6 +830,7 @@ kiki "show" args = do
                                 , spill = KF_All
                                 , initializer = Nothing
                                 , access = AutoAccess
+                                , transforms = []
                                 }
         kikiOp = KeyRingOperation
             { opFiles = Map.fromList $
@@ -866,6 +841,9 @@ kiki "show" args = do
                 ++ pems 
                 ++ walts 
                 ++ hosts
+            , opPassphrases = do pfile <- maybeToList passfd
+                                 return $ PassphraseSpec Nothing Nothing pfile
+            , opTransforms = []
             , kManip = noManip 
             , opHome = homespec
             }