diff options
Diffstat (limited to 'kiki.hs')
-rw-r--r-- | kiki.hs | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -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 ) |