diff options
| -rw-r--r-- | g10/getkey.c | 4 | ||||
| -rw-r--r-- | g10/mainproc.c | 2 | ||||
| -rw-r--r-- | g10/packet.h | 3 | ||||
| -rw-r--r-- | g10/passphrase.c | 2 | ||||
| -rw-r--r-- | g10/sig-check.c | 3 | ||||
| -rw-r--r-- | g10/sign.c | 2 |
6 files changed, 10 insertions, 6 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 908d78595..cfcf9c96a 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -324,7 +324,7 @@ get_pubkey_for_sig (ctrl_t ctrl, PKT_public_key *pk, PKT_signature *sig, return 0; } - /* First try the new ISSUER_FPR info. */ + /* First try the ISSUER_FPR info. */ fpr = issuer_fpr_raw (sig, &fprlen); if (fpr && !get_pubkey_byfprint (ctrl, pk, NULL, fpr, fprlen)) return 0; @@ -533,7 +533,7 @@ get_pubkeyblock_for_sig (ctrl_t ctrl, PKT_signature *sig) size_t fprlen; kbnode_t keyblock; - /* First try the new ISSUER_FPR info. */ + /* First try the ISSUER_FPR info. */ fpr = issuer_fpr_raw (sig, &fprlen); if (fpr && !get_pubkey_byfprint (ctrl, NULL, &keyblock, fpr, fprlen)) return keyblock; diff --git a/g10/mainproc.c b/g10/mainproc.c index 03573c921..7d8520c6c 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1976,7 +1976,7 @@ check_sig_and_print (CTX c, kbnode_t node) log_error(_("can't handle this ambiguous signature data\n")); return 0; } - } + } /* End checking signature packet composition. */ if (sig->signers_uid) write_status_buffer (STATUS_NEWSIG, diff --git a/g10/packet.h b/g10/packet.h index 5c0de577c..eec3050e9 100644 --- a/g10/packet.h +++ b/g10/packet.h @@ -318,6 +318,9 @@ typedef struct unsigned int ks_modify:1; unsigned int compacted:1; unsigned int primary:2; /* 2 if set via the primary flag, 1 if calculated */ + /* Note that this flag is set in a + * keyblock at max for one User ID and for + * one User Attribute per keyblock. */ unsigned int revoked:1; unsigned int expired:1; } flags; diff --git a/g10/passphrase.c b/g10/passphrase.c index 99a2c0dc2..54a183e54 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -249,7 +249,7 @@ passphrase_clear_cache (const char *cacheid) * Returns NULL if the user canceled the passphrase entry and if * CANCELED is not NULL, sets it to true. * - * If CREATE is true a new passphrase sll be created. If NOCACHE is + * If CREATE is true a new passphrase will be created. If NOCACHE is * true the symmetric key caching will not be used. */ DEK * passphrase_to_dek (int cipher_algo, STRING2KEY *s2k, diff --git a/g10/sig-check.c b/g10/sig-check.c index e622d9883..2534309dd 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -103,7 +103,8 @@ check_signature (ctrl_t ctrl, PKT_signature *sig, gcry_md_hd_t digest) * v5 signatures. They may be NULL to use the default. * * If FORCED_PK is not NULL this public key is used to verify the - * signature and no other public key is looked up. + * signature and no other public key is looked up. This is used to + * verify against a key included in the signature. * * If R_EXPIREDATE is not NULL, R_EXPIREDATE is set to the key's * expiry. diff --git a/g10/sign.c b/g10/sign.c index 90466e9bc..e5a3b0a29 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -204,7 +204,7 @@ mk_notation_policy_etc (ctrl_t ctrl, PKT_signature *sig, /* - * Put the Key Block subpakcet into SIG for key PKSK. Returns an + * Put the Key Block subpacket into SIG for key PKSK. Returns an * error code on failure. */ static gpg_error_t |