diff options
Diffstat (limited to 'g10/keyedit.c')
| -rw-r--r-- | g10/keyedit.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index 7a575b44b..c91deec2b 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -3253,7 +3253,15 @@ keyedit_quick_addadsk (ctrl_t ctrl, const char *fpr, const char *adskfpr) /* Locate and add the ADSK. Note that the called function already * prints error messages. */ - if (menu_addadsk (ctrl, keyblock, adskfpr)) + if (adskfpr && !ascii_strcasecmp (adskfpr, "default")) + { + err = append_all_default_adsks (ctrl, keyblock); + if (!err) + modified = 1; + else if (gpg_err_code (err) == GPG_ERR_FALSE) + err = 0; + } + else if (menu_addadsk (ctrl, keyblock, adskfpr)) modified = 1; else log_inc_errorcount (); /* (We use log_info in menu_adsk) */ @@ -4810,7 +4818,7 @@ menu_addadsk (ctrl_t ctrl, kbnode_t pub_keyblock, const char *adskfpr) KEYDB_SEARCH_DESC desc; byte fpr[MAX_FINGERPRINT_LEN]; size_t fprlen; - kbnode_t node, node2; + kbnode_t node; log_assert (pub_keyblock->pkt->pkttype == PKT_PUBLIC_KEY); @@ -4895,22 +4903,10 @@ menu_addadsk (ctrl_t ctrl, kbnode_t pub_keyblock, const char *adskfpr) } /* Check that the selected subkey is not yet on our keyblock. */ - for (node2 = pub_keyblock; node2; node2 = node2->next) - { - if (node2->pkt->pkttype == PKT_PUBLIC_KEY - || node2->pkt->pkttype == PKT_PUBLIC_SUBKEY) - { - pk = node2->pkt->pkt.public_key; - fingerprint_from_pk (pk, fpr, &fprlen); - if (fprlen == 20 - && !memcmp (fpr, desc.u.fpr, 20)) - break; - } - } - if (node2) + err = has_key_with_fingerprint (pub_keyblock, desc.u.fpr, 20); + if (err) { log_info (_("key \"%s\" is already on this keyblock\n"), answer); - err = gpg_error (GPG_ERR_DUP_KEY); if (adskfpr) goto leave; continue; |