summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kiki.hs4
-rw-r--r--lib/KeyRing.hs4
2 files changed, 4 insertions, 4 deletions
diff --git a/kiki.hs b/kiki.hs
index 842e697..e10c2a8 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1330,7 +1330,7 @@ kiki "merge" args = do
1330 1330
1331 doDelete :: String -> StreamInfo -> KeyRingOperation -> (StreamInfo,KeyRingOperation) 1331 doDelete :: String -> StreamInfo -> KeyRingOperation -> (StreamInfo,KeyRingOperation)
1332 doDelete fp flow op = ( flow 1332 doDelete fp flow op = ( flow
1333 , op { opTransforms = opTransforms op ++ [DeleteSubKey fp] } ) 1333 , op { opTransforms = opTransforms op ++ [DeleteSubkeyByFingerprint fp] } )
1334 1334
1335 doAutosign :: Bool -> StreamInfo -> KeyRingOperation -> (StreamInfo,KeyRingOperation) 1335 doAutosign :: Bool -> StreamInfo -> KeyRingOperation -> (StreamInfo,KeyRingOperation)
1336 doAutosign True flow op = 1336 doAutosign True flow op =
@@ -1568,7 +1568,7 @@ kiki "delete" args = do
1568 ] 1568 ]
1569 , opPassphrases = do pfile <- maybeToList passfd 1569 , opPassphrases = do pfile <- maybeToList passfd
1570 return $ PassphraseSpec Nothing Nothing pfile 1570 return $ PassphraseSpec Nothing Nothing pfile
1571 , opTransforms = map DeleteSubKey fps 1571 , opTransforms = map DeleteSubkeyByFingerprint fps
1572 , opHome = homespec 1572 , opHome = homespec
1573 } 1573 }
1574 KikiResult rt report <- runKeyRing kikiOp 1574 KikiResult rt report <- runKeyRing kikiOp
diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index 1c6dea8..74b883f 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -428,7 +428,7 @@ data Transform =
428 -- A tor-style UID is one of the following form: 428 -- A tor-style UID is one of the following form:
429 -- 429 --
430 -- > Anonymous <root@HOSTNAME.onion> 430 -- > Anonymous <root@HOSTNAME.onion>
431 | DeleteSubKey String 431 | DeleteSubkeyByFingerprint String
432 -- ^ Delete the subkey specified by the given fingerprint and any 432 -- ^ Delete the subkey specified by the given fingerprint and any
433 -- associated signatures on that key. 433 -- associated signatures on that key.
434 deriving (Eq,Ord,Show) 434 deriving (Eq,Ord,Show)
@@ -2687,7 +2687,7 @@ resolveTransform Autosign rt kd@(KeyData k ksigs umap submap) = ops
2687 gs = groupBy sameMaster (sortBy (comparing code) bindings') 2687 gs = groupBy sameMaster (sortBy (comparing code) bindings')
2688 2688
2689 2689
2690resolveTransform (DeleteSubKey fp) rt kd@(KeyData k ksigs umap submap) = fmap (SubKeyDeletion topk) subk 2690resolveTransform (DeleteSubkeyByFingerprint fp) rt kd@(KeyData k ksigs umap submap) = fmap (SubKeyDeletion topk) subk
2691 where 2691 where
2692 topk = keykey $ packet k -- key to master of key to be deleted 2692 topk = keykey $ packet k -- key to master of key to be deleted
2693 subk = do 2693 subk = do