diff options
author | Werner Koch <[email protected]> | 2019-03-15 18:50:37 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2019-03-18 12:16:35 +0000 |
commit | 43b23aa82be7e02414398af506986b812e2b9349 (patch) | |
tree | 9a0d7ae5fa938f99975f2b4a9b8305ba8c320a7a /tools/wks-util.c | |
parent | tests: Add sample secret key w/o binding signatures. (diff) | |
download | gnupg-43b23aa82be7e02414398af506986b812e2b9349.tar.gz gnupg-43b23aa82be7e02414398af506986b812e2b9349.zip |
gpg: Avoid importing secret keys if the keyblock is not valid.
* g10/keydb.h (struct kbnode_struct): Replace unused field RECNO by
new field TAG.
* g10/kbnode.c (alloc_node): Change accordingly.
* g10/import.c (import_one): Add arg r_valid.
(sec_to_pub_keyblock): Set tags.
(resync_sec_with_pub_keyblock): New.
(import_secret_one): Change return code to gpg_error_t. Return an
error code if sec_to_pub_keyblock failed. Resync secret keyblock.
--
When importing an invalid secret key ring for example without key
binding signatures or no UIDs, gpg used to let gpg-agent store the
secret keys anyway. This is clearly a bug because the diagnostics
before claimed that for example the subkeys have been skipped.
Importing the secret key parameters then anyway is surprising in
particular because a gpg -k does not show the key. After importing
the public key the secret keys suddenly showed up.
This changes the behaviour of
GnuPG-bug-id: 4392
to me more consistent but is not a solution to the actual bug.
Caution: The ecc.scm test now fails because two of the sample keys
don't have binding signatures.
Signed-off-by: Werner Koch <[email protected]>
(cherry picked from commit f799e9728bcadb3d4148a47848c78c5647860ea4)
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions