diff options
| author | Justus Winter <justus@g10code.com> | 2017-06-13 15:27:43 +0200 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2017-06-13 15:36:47 +0200 |
| commit | 8095d16b3ef6b5f01ec351824855708149f1c1c3 (patch) | |
| tree | 09d7c9a240120dea88d366cc8d9acbf26b616fe8 /g10/keyedit.c | |
| parent | dirmngr: Implement querying nameservers over IPv6. (diff) | |
| download | gnupg2-8095d16b3ef6b5f01ec351824855708149f1c1c3.tar.xz gnupg2-8095d16b3ef6b5f01ec351824855708149f1c1c3.zip | |
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 <justus@g10code.com>
Diffstat (limited to 'g10/keyedit.c')
| -rw-r--r-- | g10/keyedit.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index 9f6add1bc..30cf012d9 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -48,6 +48,7 @@ #include "call-agent.h" #include "../common/host2net.h" #include "tofu.h" +#include "keyedit.h" static void show_prefs (PKT_user_id * uid, PKT_signature * selfsig, int verbose); @@ -105,17 +106,6 @@ static int update_trust = 0; #define CONTROL_D ('D' - 'A' + 1) -#define NODFLG_BADSIG (1<<0) /* Bad signature. */ -#define NODFLG_NOKEY (1<<1) /* No public key. */ -#define NODFLG_SIGERR (1<<2) /* Other sig error. */ - -#define NODFLG_MARK_A (1<<4) /* Temporary mark. */ -#define NODFLG_DELSIG (1<<5) /* To be deleted. */ - -#define NODFLG_SELUID (1<<8) /* Indicate the selected userid. */ -#define NODFLG_SELKEY (1<<9) /* Indicate the selected key. */ -#define NODFLG_SELSIG (1<<10) /* Indicate a selected signature. */ - struct sign_attrib { int non_exportable, non_revocable; @@ -201,10 +191,10 @@ print_and_check_one_sig_colon (ctrl_t ctrl, kbnode_t keyblock, kbnode_t node, * packet. With EXTENDED set all possible signature list options will * always be printed. */ -static int -print_one_sig (ctrl_t ctrl, int rc, kbnode_t keyblock, kbnode_t node, - int *inv_sigs, int *no_key, int *oth_err, - int is_selfsig, int print_without_key, int extended) +int +keyedit_print_one_sig (ctrl_t ctrl, int rc, kbnode_t keyblock, kbnode_t node, + int *inv_sigs, int *no_key, int *oth_err, + int is_selfsig, int print_without_key, int extended) { PKT_signature *sig = node->pkt->pkt.signature; int sigrc; @@ -326,9 +316,9 @@ print_and_check_one_sig (ctrl_t ctrl, kbnode_t keyblock, kbnode_t node, int rc; rc = check_key_signature (ctrl, keyblock, node, is_selfsig); - return print_one_sig (ctrl, rc, - keyblock, node, inv_sigs, no_key, oth_err, - *is_selfsig, print_without_key, extended); + return keyedit_print_one_sig (ctrl, rc, + keyblock, node, inv_sigs, no_key, oth_err, + *is_selfsig, print_without_key, extended); } @@ -808,8 +798,8 @@ check_all_keysigs (ctrl_t ctrl, kbnode_t kb, } if (modified) - print_one_sig (ctrl, rc, kb, n, NULL, NULL, NULL, has_selfsig, - 0, only_selfsigs); + keyedit_print_one_sig (ctrl, rc, kb, n, NULL, NULL, NULL, + has_selfsig, 0, only_selfsigs); } if (dump_sig_params) |