From 5da12674eaae11969b22e6f80e4957217ad406d6 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 25 Apr 2011 23:56:47 +0200 Subject: Fix regression in gpg's mail address parsing. Since 2009-12-08 gpg was not able to find email addresses indicated by a leading '<'. This happened when I merged the user id classification code of gpgsm and gpg. --- dirmngr/ChangeLog | 6 ++++++ dirmngr/ks-engine-hkp.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'dirmngr') diff --git a/dirmngr/ChangeLog b/dirmngr/ChangeLog index f7ac88719..e024bab43 100644 --- a/dirmngr/ChangeLog +++ b/dirmngr/ChangeLog @@ -1,3 +1,9 @@ +2011-04-25 Werner Koch + + * ks-engine-hkp.c (ks_hkp_search): Mark classify_user_id for use + with OpenPGP. + (ks_hkp_get): Ditto. + 2011-04-12 Werner Koch * ks-engine-hkp.c (ks_hkp_search, ks_hkp_get, ks_hkp_put): Factor diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c index 0dd9a646d..d4a12111b 100644 --- a/dirmngr/ks-engine-hkp.c +++ b/dirmngr/ks-engine-hkp.c @@ -654,7 +654,7 @@ ks_hkp_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern, Note that HKP keyservers like the 0x to be present when searching by keyid. We need to re-format the fingerprint and keyids so to remove the gpg specific force-use-of-this-key flag ("!"). */ - err = classify_user_id (pattern, &desc); + err = classify_user_id (pattern, &desc, 1); if (err) return err; switch (desc.mode) @@ -772,7 +772,7 @@ ks_hkp_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec, estream_t *r_fp) Note that HKP keyservers like the 0x to be present when searching by keyid. We need to re-format the fingerprint and keyids so to remove the gpg specific force-use-of-this-key flag ("!"). */ - err = classify_user_id (keyspec, &desc); + err = classify_user_id (keyspec, &desc, 1); if (err) return err; switch (desc.mode) -- cgit v1.2.3