From 9cd371b12d80cfc5bc85cb6e5f5eebb4decbe94f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 20 Feb 2025 14:50:20 +0100 Subject: [PATCH] gpg: Remove a signature check function wrapper. * g10/sig-check.c (check_signature2): Rename to (check_signature): this and remove the old wrapper. Adjust all callers. CVE: CVE-2025-30258 Upstream-Status: Backport [https://dev.gnupg.org/rG9cd371b12d80cfc5bc85cb6e5f5eebb4decbe94f] Signed-off-by: Yogita Urade --- g10/mainproc.c | 13 +++++-------- g10/packet.h | 6 +----- g10/sig-check.c | 26 ++++++++------------------ 3 files changed, 14 insertions(+), 31 deletions(-) diff --git a/g10/mainproc.c b/g10/mainproc.c index af11877..79d9ff2 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1198,19 +1198,17 @@ do_check_sig (CTX c, kbnode_t node, const void *extrahash, size_t extrahashlen, /* We only get here if we are checking the signature of a binary (0x00) or text document (0x01). */ - rc = check_signature2 (c->ctrl, sig, md, extrahash, extrahashlen, - forced_pk, - NULL, is_expkey, is_revkey, r_pk); + rc = check_signature (c->ctrl, sig, md, extrahash, extrahashlen, + forced_pk, NULL, is_expkey, is_revkey, r_pk); if (! rc) md_good = md; else if (gpg_err_code (rc) == GPG_ERR_BAD_SIGNATURE && md2) { PKT_public_key *pk2; - rc = check_signature2 (c->ctrl, sig, md2, extrahash, extrahashlen, - forced_pk, - NULL, is_expkey, is_revkey, - r_pk? &pk2 : NULL); + rc = check_signature (c->ctrl, sig, md2, extrahash, extrahashlen, + forced_pk, NULL, is_expkey, is_revkey, + r_pk? &pk2 : NULL); if (!rc) { md_good = md2; @@ -1792,7 +1790,6 @@ issuer_fpr_string (PKT_signature *sig) return p? bin2hex (p, n, NULL) : NULL; } - static void print_good_bad_signature (int statno, const char *keyid_str, kbnode_t un, PKT_signature *sig, int rc) diff --git a/g10/packet.h b/g10/packet.h index 5a14015..8aaf32d 100644 --- a/g10/packet.h +++ b/g10/packet.h @@ -889,16 +889,12 @@ int cmp_user_ids( PKT_user_id *a, PKT_user_id *b ); /*-- sig-check.c --*/ -/* Check a signature. This is shorthand for check_signature2 with - the unnamed arguments passed as NULL. */ -int check_signature (ctrl_t ctrl, PKT_signature *sig, gcry_md_hd_t digest); - /* Check a signature. Looks up the public key from the key db. (If * R_PK is not NULL, it is stored at RET_PK.) DIGEST contains a * valid hash context that already includes the signed data. This * function adds the relevant meta-data to the hash before finalizing * it and verifying the signature. FOCRED_PK is usually NULL. */ -gpg_error_t check_signature2 (ctrl_t ctrl, +gpg_error_t check_signature (ctrl_t ctrl, PKT_signature *sig, gcry_md_hd_t digest, const void *extrahash, size_t extrahashlen, PKT_public_key *forced_pk, diff --git a/g10/sig-check.c b/g10/sig-check.c index eb6c966..2272fa4 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -95,17 +95,6 @@ check_key_verify_compliance (PKT_public_key *pk) } - -/* Check a signature. This is shorthand for check_signature2 with - the unnamed arguments passed as NULL. */ -int -check_signature (ctrl_t ctrl, PKT_signature *sig, gcry_md_hd_t digest) -{ - return check_signature2 (ctrl, sig, digest, NULL, 0, NULL, - NULL, NULL, NULL, NULL); -} - - /* Check a signature. * * Looks up the public key that created the signature (SIG->KEYID) @@ -151,12 +140,12 @@ check_signature (ctrl_t ctrl, PKT_signature *sig, gcry_md_hd_t digest) * * Returns 0 on success. An error code otherwise. */ gpg_error_t -check_signature2 (ctrl_t ctrl, - PKT_signature *sig, gcry_md_hd_t digest, - const void *extrahash, size_t extrahashlen, - PKT_public_key *forced_pk, - u32 *r_expiredate, - int *r_expired, int *r_revoked, PKT_public_key **r_pk) +check_signature (ctrl_t ctrl, + PKT_signature *sig, gcry_md_hd_t digest, + const void *extrahash, size_t extrahashlen, + PKT_public_key *forced_pk, + u32 *r_expiredate, int *r_expired, int *r_revoked, + PKT_public_key **r_pk) { int rc=0; PKT_public_key *pk; @@ -808,7 +797,8 @@ check_revocation_keys (ctrl_t ctrl, PKT_public_key *pk, PKT_signature *sig) hash_public_key(md,pk); /* Note: check_signature only checks that the signature is good. It does not fail if the key is revoked. */ - rc = check_signature (ctrl, sig, md); + rc = check_signature (ctrl, sig, md, NULL, 0, NULL, + NULL, NULL, NULL, NULL); cache_sig_result(sig,rc); gcry_md_close (md); break; -- 2.40.0