security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity

Fix import stat counter and abort secret key import on merge-only error case.

Browse Source
This commit is contained in:
Marcus Brinkmann 2011-04-29 12:02:46 +02:00
parent a286e95f3a
commit 10cccd45af
2 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2011-04-29 Marcus Brinkmann <marcus@g10code.com>
* import.c (import_secret_one): Leave all checks to import_one.
Cancel secret key import if public key was skipped due to
merge-only request. Fix import status for non-new secret key
import by checking stat counter.
2011-04-29 Marcus Brinkmann <marcus@g10code.com> 2011-04-29 Marcus Brinkmann <marcus@g10code.com>
* delkey.c (do_delete_key): Access public keyblock even for secret * delkey.c (do_delete_key): Access public keyblock even for secret

52
g10/import.c
View File

@ -1521,6 +1521,8 @@ import_secret_one (ctrl_t ctrl, const char *fname, KBNODE keyblock,
KBNODE node, uidnode; KBNODE node, uidnode;
u32 keyid[2]; u32 keyid[2];
int rc = 0; int rc = 0;
int nr_prev;
kbnode_t pub_keyblock;
/* Get the key and print some info about it */ /* Get the key and print some info about it */
node = find_kbnode (keyblock, PKT_SECRET_KEY); node = find_kbnode (keyblock, PKT_SECRET_KEY);
@ -1581,24 +1583,30 @@ import_secret_one (ctrl_t ctrl, const char *fname, KBNODE keyblock,
clear_kbnode_flags (keyblock); clear_kbnode_flags (keyblock);
if (!(options&IMPORT_MERGE_ONLY) || !have_secret_key_with_kid (keyid) ) nr_prev = stats->skipped_new_keys;
{
/* We don't have this key, insert as a new key. */
kbnode_t pub_keyblock;
/* Make a public key out of this. */ /* Make a public key out of the key. */
pub_keyblock = sec_to_pub_keyblock (keyblock); pub_keyblock = sec_to_pub_keyblock (keyblock);
if (!pub_keyblock) if (!pub_keyblock)
log_error ("key %s: failed to create public key from secret key\n", log_error ("key %s: failed to create public key from secret key\n",
keystr_from_pk (pk)); keystr_from_pk (pk));
else else
{ {
import_one (ctrl, fname, pub_keyblock, stats, /* Note that this outputs an IMPORT_OK status message for the
NULL, NULL, opt.import_options, 1); public key block, and below we will output another one for
/* Fixme: We should check for an invalid keyblock and the secret keys. FIXME? */
cancel the secret key import in this case. */ import_one (ctrl, fname, pub_keyblock, stats,
release_kbnode (pub_keyblock); NULL, NULL, opt.import_options, 1);
/* Fixme: We should check for an invalid keyblock and
cancel the secret key import in this case. */
release_kbnode (pub_keyblock);
/* At least we cancel the secret key import when the public key
import was skipped due to MERGE_ONLY option and a new
key. */
if (stats->skipped_new_keys <= nr_prev)
{
/* Read the keyblock again to get the effects of a merge. */ /* Read the keyblock again to get the effects of a merge. */
/* Fixme: we should do this based on the fingerprint or /* Fixme: we should do this based on the fingerprint or
even better let import_one return the merged even better let import_one return the merged
@ -1609,27 +1617,23 @@ import_secret_one (ctrl_t ctrl, const char *fname, KBNODE keyblock,
keystr_from_pk (pk)); keystr_from_pk (pk));
else else
{ {
nr_prev = stats->secret_imported;
if (!transfer_secret_keys (ctrl, stats, keyblock)) if (!transfer_secret_keys (ctrl, stats, keyblock))
{ {
int status = 16;
if (!opt.quiet) if (!opt.quiet)
log_info (_("key %s: secret key imported\n"), log_info (_("key %s: secret key imported\n"),
keystr_from_pk (pk)); keystr_from_pk (pk));
if (stats->secret_imported > nr_prev)
status |= 1;
if (is_status_enabled ()) if (is_status_enabled ())
print_import_ok (pk, 1|16); print_import_ok (pk, status);
check_prefs (ctrl, node); check_prefs (ctrl, node);
} }
release_kbnode (node); release_kbnode (node);
} }
} }
} }
else
{
/* We don't want to merge the secret keys. */
log_error (_("key %s: secret key part already available\n"),
keystr_from_pk (pk));
if (is_status_enabled ())
print_import_ok (pk, 16);
}
return rc; return rc;
} }