From 8095d16b3ef6b5f01ec351824855708149f1c1c3 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Tue, 13 Jun 2017 15:27:43 +0200 Subject: gpg: Refactor keyedit module. * g10/Makefile.am (gpg_SOURCES): Add new file. * g10/keyedit.c (NODFLG_*): Move flags to the new header file. (print_one_sig): Export symbol and rename accordingly. (print_and_check_one_sig): Adapt accordingly. (check_all_keysigs): Likewise. * g10/keyedit.h: New file. * g10/main.h: Drop declarations, include new header. GnuPG-bug-id: 2236 Signed-off-by: Justus Winter --- g10/main.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'g10/main.h') diff --git a/g10/main.h b/g10/main.h index 33116d2ef..dad0fe3f9 100644 --- a/g10/main.h +++ b/g10/main.h @@ -23,6 +23,7 @@ #include "../common/types.h" #include "../common/iobuf.h" #include "keydb.h" +#include "keyedit.h" #include "../common/util.h" /* It could be argued that the default cipher should be 3DES rather @@ -285,24 +286,6 @@ gpg_error_t check_signature_over_key_or_uid (ctrl_t ctrl, gpg_error_t delete_keys (ctrl_t ctrl, strlist_t names, int secret, int allow_both); -/*-- keyedit.c --*/ -void keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr, - strlist_t commands, int quiet, int seckey_check ); -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_revuid (ctrl_t ctrl, const char *username, - const char *uidtorev); -void keyedit_quick_sign (ctrl_t ctrl, const char *fpr, - strlist_t uids, strlist_t locusr, int local); -void keyedit_quick_set_expire (ctrl_t ctrl, - const char *fpr, const char *expirestr); -void keyedit_quick_set_primary (ctrl_t ctrl, const char *username, - const char *primaryuid); -void show_basic_key_info (ctrl_t ctrl, kbnode_t keyblock); - /*-- keygen.c --*/ const char *get_default_pubkey_algo (void); u32 parse_expire_string(const char *string); -- cgit v1.2.3