security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-13 22:21:09 +02:00
Code Activity

gpg: Minor restructuring of a function.

Browse Source 
--

This is for easier reading and future changing.
This commit is contained in:
Werner Koch 2021-04-12 17:50:17 +02:00
parent ecb9265b8d
commit d984de172c
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
g10/getkey.c
View File

@ -3857,66 +3857,75 @@ lookup (ctrl_t ctrl, getkey_ctx_t ctx, int want_secret,
} }
/* If a default key has been specified, return that key. If a card
* based key is also available as indicated by FPR_CARD not being
* NULL, return that key if suitable. */
gpg_error_t gpg_error_t
get_seckey_default_or_card (ctrl_t ctrl, PKT_public_key *pk, get_seckey_default_or_card (ctrl_t ctrl, PKT_public_key *pk,
const byte *fpr_card, size_t fpr_len) const byte *fpr_card, size_t fpr_len)
{ {
gpg_error_t err; gpg_error_t err;
strlist_t namelist = NULL; strlist_t namelist = NULL;
const char *def_secret_key;
const char *def_secret_key = parse_def_secret_key (ctrl); def_secret_key = parse_def_secret_key (ctrl);
if (def_secret_key) if (def_secret_key)
add_to_strlist (&namelist, def_secret_key); add_to_strlist (&namelist, def_secret_key);
else if (fpr_card) else if (fpr_card)
{ {
int rc = get_pubkey_byfprint (ctrl, pk, NULL, fpr_card, fpr_len); err = get_pubkey_byfprint (ctrl, pk, NULL, fpr_card, fpr_len);
/* The key on card can be not suitable for requested usage. */ /* The key on card can be not suitable for requested usage. */
if (rc == GPG_ERR_UNUSABLE_PUBKEY) if (gpg_err_code (err) == GPG_ERR_UNUSABLE_PUBKEY)
fpr_card = NULL; /* Fallthrough as no card. */ fpr_card = NULL; /* Fallthrough as no card. */
else else
return rc; return err; /* Success or other error. */
} }
if (!fpr_card if (!fpr_card || (def_secret_key && *def_secret_key
|| (def_secret_key && def_secret_key[strlen (def_secret_key)-1] == '!')) && def_secret_key[strlen (def_secret_key)-1] == '!'))
err = key_byname (ctrl, NULL, namelist, pk, 1, 0, NULL, NULL); {
err = key_byname (ctrl, NULL, namelist, pk, 1, 0, NULL, NULL);
}
else else
{ /* Default key is specified and card key is also available. */ { /* Default key is specified and card key is also available. */
kbnode_t k, keyblock = NULL; kbnode_t k, keyblock = NULL;
err = key_byname (ctrl, NULL, namelist, pk, 1, 0, &keyblock, NULL); err = key_byname (ctrl, NULL, namelist, pk, 1, 0, &keyblock, NULL);
if (!err) if (err)
for (k = keyblock; k; k = k->next) goto leave;
{ for (k = keyblock; k; k = k->next)
PKT_public_key *pk_candidate; {
char fpr[MAX_FINGERPRINT_LEN]; PKT_public_key *pk_candidate;
char fpr[MAX_FINGERPRINT_LEN];
if (k->pkt->pkttype != PKT_PUBLIC_KEY if (k->pkt->pkttype != PKT_PUBLIC_KEY
&&k->pkt->pkttype != PKT_PUBLIC_SUBKEY) &&k->pkt->pkttype != PKT_PUBLIC_SUBKEY)
continue; continue;
pk_candidate = k->pkt->pkt.public_key; pk_candidate = k->pkt->pkt.public_key;
if (!pk_candidate->flags.valid) if (!pk_candidate->flags.valid)
continue; continue;
if (!((pk_candidate->pubkey_usage & USAGE_MASK) & pk->req_usage)) if (!((pk_candidate->pubkey_usage & USAGE_MASK) & pk->req_usage))
continue; continue;
fingerprint_from_pk (pk_candidate, fpr, NULL); fingerprint_from_pk (pk_candidate, fpr, NULL);
if (!memcmp (fpr_card, fpr, fpr_len)) if (!memcmp (fpr_card, fpr, fpr_len))
{ {
release_public_key_parts (pk); release_public_key_parts (pk);
copy_public_key (pk, pk_candidate); copy_public_key (pk, pk_candidate);
break; break;
} }
} }
release_kbnode (keyblock); release_kbnode (keyblock);
} }
leave:
free_strlist (namelist); free_strlist (namelist);
return err; return err;
} }
/********************************************* /*********************************************
*********** User ID printing helpers ******* *********** User ID printing helpers *******

2
g10/sign.c
View File

@ -997,7 +997,7 @@ write_signature_packets (ctrl_t ctrl,
/* /*
* Sign the files whose names are in FILENAME usingall secret keys * Sign the files whose names are in FILENAME using all secret keys
* which can be taken from LOCUSR, if this is NULL, use the default * which can be taken from LOCUSR, if this is NULL, use the default
* secret key. * secret key.
* If DETACHED has the value true, make a detached signature. * If DETACHED has the value true, make a detached signature.