diff options
| author | Thomas Roessler <roessler@does-not-exist.org> | 2001-02-12 17:21:37 +0000 |
|---|---|---|
| committer | Thomas Roessler <roessler@does-not-exist.org> | 2001-02-12 17:21:37 +0000 |
| commit | fe573eb97b07fa240232dfa0aa174017667ecdd8 (patch) | |
| tree | fa81f4bba8eae775efff04d1aa46ea6437e6656d /gnupgparse.c | |
| parent | 3afe7d22837c0cca6df26fa5335aa0695eba13fc (diff) | |
Auto-detect the micalg used with PGP/MIME signatures.
Diffstat (limited to 'gnupgparse.c')
| -rw-r--r-- | gnupgparse.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnupgparse.c b/gnupgparse.c index c7feca89..88b1716e 100644 --- a/gnupgparse.c +++ b/gnupgparse.c @@ -252,6 +252,10 @@ static pgp_key_t *parse_pub_line (char *buf, int *is_subkey, pgp_key_t *k) { if (!pend || !*p) break; /* empty field or no trailing colon */ + + /* ignore user IDs on subkeys */ + if (!is_uid && (*is_subkey && option (OPTPGPIGNORESUB))) + break; dprint (2, (debugfile, "user ID: %s\n", p)); @@ -318,7 +322,7 @@ pgp_key_t *pgp_get_candidates (pgp_ring_t keyring, LIST * hints) if (is_sub) { pgp_uid_t **l; - + k->flags |= KEYFLAG_SUBKEY; k->parent = mainkey; for (l = &k->address; *l; l = &(*l)->next) |