diff options
| author | Werner Koch <[email protected]> | 2019-09-09 12:34:09 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-09-09 13:01:47 +0000 |
| commit | aba82684fe14289cf62b4694bc398f3a274b4762 (patch) | |
| tree | b66c13bcb29f62f64c4aaa603d510b0fd65cb7cc /g10/misc.c | |
| parent | kbx: Fix keyboxd search first. (diff) | |
| download | gnupg-aba82684fe14289cf62b4694bc398f3a274b4762.tar.gz gnupg-aba82684fe14289cf62b4694bc398f3a274b4762.zip | |
gpg: New option --use-keyboxd.
* g10/gpg.c (oUseKeyboxd,oKeyboxdProgram): New consts.
(opts): New options --use-keyboxd and --keyboxd-program.
(main): Implement them.
* g10/keydb.c: Move some defs out to ...
* g10/keydb-private.h: new file.
* g10/keydb.c: prefix function names with "internal" and move original
functions to ...
* g10/call-keyboxd.c: new file. Divert to the internal fucntion if
--use-keyboxd is used. Add a CTRL arg to most fucntions and change
all callers.
* g10/Makefile.am (common_source): Add new files.
(noinst_PROGRAMS): Do bot build gpgcompose.
--
Note that this is just the framework with only a basic implementation
of searching via keyboxd.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/misc.c')
| -rw-r--r-- | g10/misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/misc.c b/g10/misc.c index 0541d2b77..c2d5bbb8e 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -895,7 +895,7 @@ get_signature_count (PKT_public_key *pk) /* Expand %-strings. Returns a string which must be xfreed. Returns NULL if the string cannot be expanded (too large). */ char * -pct_expando(const char *string,struct expando_args *args) +pct_expando (ctrl_t ctrl, const char *string,struct expando_args *args) { const char *ch=string; int idx=0,maxlen=0,done=0; @@ -1017,7 +1017,7 @@ pct_expando(const char *string,struct expando_args *args) PKT_public_key *pk= xmalloc_clear(sizeof(PKT_public_key)); - if (!get_pubkey_fast (pk,args->pksk->main_keyid)) + if (!get_pubkey_fast (ctrl, pk,args->pksk->main_keyid)) fingerprint_from_pk (pk, array, &len); else memset (array, 0, (len=MAX_FINGERPRINT_LEN)); |