diff options
| author | Werner Koch <[email protected]> | 2016-06-02 13:54:48 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-06-02 14:01:48 +0000 |
| commit | 8f2a053a0ffa0430d01a53b4d491a3f0fff683eb (patch) | |
| tree | 0251344b7eb7b579016fbaf393de014cf19daa33 /g10/main.h | |
| parent | gpg: Do not abort on certain invalid packets. (diff) | |
| download | gnupg-8f2a053a0ffa0430d01a53b4d491a3f0fff683eb.tar.gz gnupg-8f2a053a0ffa0430d01a53b4d491a3f0fff683eb.zip | |
gpg: New command --quick-addkey.
* g10/keygen.c (DEFAULT_STD_SUBKEYUSE): New.
(ask_keysize): Factor code out to ...
(get_keysize_range, fixup_keysize): new.
(parse_parameter_usage): Factor parsing out to ...
(parse_usagestr): new. Allow use of "encr" as alias for "encrypt".
(parse_subkey_algostr_usagestr): New.
(generate_subkeypair): Add new args. Implement unattended mode.
* g10/keyedit.c (keyedit_quick_sign): Factor some code out to ...
(find_by_primary_fpr): new.
(keyedit_quick_addkey): New.
* g10/gpg.c (aQuickAddKey): New.
(opts): Add --quick-addkey.
(main): Implement.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/g10/main.h b/g10/main.h index 5b5947e48..0ca4d3947 100644 --- a/g10/main.h +++ b/g10/main.h @@ -287,6 +287,8 @@ void keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr, void keyedit_passwd (ctrl_t ctrl, const char *username); void keyedit_quick_adduid (ctrl_t ctrl, const char *username, const char *newuid); +void keyedit_quick_addkey (ctrl_t ctrl, const char *fpr, const char *algostr, + const char *usagestr, const char *expirestr); void keyedit_quick_sign (ctrl_t ctrl, const char *fpr, strlist_t uids, strlist_t locusr, int local); void show_basic_key_info (KBNODE keyblock); @@ -311,7 +313,10 @@ int keygen_add_revkey(PKT_signature *sig, void *opaque); gpg_error_t make_backsig (PKT_signature *sig, PKT_public_key *pk, PKT_public_key *sub_pk, PKT_public_key *sub_psk, u32 timestamp, const char *cache_nonce); -gpg_error_t generate_subkeypair (ctrl_t ctrl, kbnode_t pub_keyblock); +gpg_error_t generate_subkeypair (ctrl_t ctrl, kbnode_t keyblock, + const char *algostr, + const char *usagestr, + const char *expirestr); #ifdef ENABLE_CARD_SUPPORT gpg_error_t generate_card_subkeypair (kbnode_t pub_keyblock, int keyno, const char *serialno); |