security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

gpg: Fix regression due to the keyserver import filter.

Browse source 
* g10/keyserver.c (keyserver_retrieval_filter): Change args.  Rewrite
to take subpakets in account.
* g10/import.c (import_one, import_secret_one): Pass keyblock to
filter.
--

GnuPG-bug-id: 1680
This commit is contained in:
Werner Koch 2014-08-06 17:11:21 +02:00
parent 25d5480e98
commit 088f82c0b5
3 changed files with 49 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
g10/main.h
View file

@ -261,8 +261,7 @@ gcry_mpi_t encode_md_value( PKT_public_key *pk, PKT_secret_key *sk,
/*-- import.c --*/
typedef int (*import_filter_t)(PKT_public_key *pk, PKT_secret_key *sk,
void *arg);
typedef int (*import_filter_t)(kbnode_t keyblock, void *arg);
int parse_import_options(char *str,unsigned int *options,int noisy);
void import_keys( char **fnames, int nnames,