security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +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

4
g10/import.c
View file

@ -799,7 +799,7 @@ import_one( const char *fname, KBNODE keyblock, struct stats_s *stats,
return 0;
}
if (filter && filter (pk, NULL, filter_arg))
if (filter && filter (keyblock, filter_arg))
{
log_error (_("key %s: %s\n"), keystr_from_pk(pk),
_("rejected by import filter"));
@ -1201,7 +1201,7 @@ import_secret_one (const char *fname, KBNODE keyblock,
keyid_from_sk( sk, keyid );
uidnode = find_next_kbnode( keyblock, PKT_USER_ID );
if (filter && filter (NULL, sk, filter_arg)) {
if (filter && filter (keyblock, filter_arg)) {
log_error (_("secret key %s: %s\n"), keystr_from_sk(sk),
_("rejected by import filter"));
return 0;