summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Crayne <joe@jerkface.net>2020-05-07 12:09:08 -0400
committerJoe Crayne <joe@jerkface.net>2020-05-07 12:12:41 -0400
commit61e68ed8087369bead3420aaadb06ca4b4279b42 (patch)
treeb22192d542f504c891852f9fc67f1188a86236d9
parent9058b14426d159651df10e47a26f81110ed89c02 (diff)
Update merge command to create 25519 keys.
-rw-r--r--kiki.hs11
1 files changed, 10 insertions, 1 deletions
diff --git a/kiki.hs b/kiki.hs
index bbe73f8..1138b7a 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1323,7 +1323,10 @@ kiki "merge" [] = do
1323 , " If not specified, default is to spill (read and use but" 1323 , " If not specified, default is to spill (read and use but"
1324 , " don't write)." 1324 , " don't write)."
1325 , "" 1325 , ""
1326 , " --create=(rsa:SIZE|cmd:CMD)" 1326 , " --create=(rsa:SIZE|ed25519|cv25519|cmd:CMD)"
1327 , " This should be used with a filename to export to in PEM"
1328 , " format but this is just a dummy argument if the flow is set"
1329 , " to spill."
1327 , "" 1330 , ""
1328 , " --autosign[=no]" 1331 , " --autosign[=no]"
1329 , "" 1332 , ""
@@ -1490,6 +1493,12 @@ kiki "merge" args = do
1490 digits -> Internal (GenRSA (read digits `div` 8)) } 1493 digits -> Internal (GenRSA (read digits `div` 8)) }
1491 specs 1494 specs
1492 , op ) 1495 , op )
1496 Left ("create",Just "ed25519")
1497 -> ( (si { initializer = Internal GenEd25519 }, specs)
1498 , op )
1499 Left ("create",Just "cv25519")
1500 -> ( (si { initializer = Internal GenCv25519 }, specs)
1501 , op )
1493 Left ("type",Just "keyring") -> ( (,) si { typ = KeyRingFile } specs, op ) 1502 Left ("type",Just "keyring") -> ( (,) si { typ = KeyRingFile } specs, op )
1494 Left ("type",Just "pem" ) -> ( (,) si { typ = PEMFile } specs, op ) 1503 Left ("type",Just "pem" ) -> ( (,) si { typ = PEMFile } specs, op )
1495 Left ("type",Just "wallet" ) -> ( (,) si { typ = WalletFile } specs, op ) 1504 Left ("type",Just "wallet" ) -> ( (,) si { typ = WalletFile } specs, op )