From 5c2080f4670a768787f5cb4ed5c32e0946837883 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 8 Jun 2020 20:13:25 +0200 Subject: gpg: If possible TRUST values now depend on signer's UID or --sender. * g10/mainproc.c (check_sig_and_print): Add failsafe check for PK. Pass KEYBLOCK down do check_signatures_trust. Protect existsing error ocde in case the signature expired. * g10/pkclist.c (is_in_sender_list): New. (check_signatures_trust): Add args keyblock and pk. Add new uid based checking code. * g10/test-stubs.c, g10/gpgv.c: Adjust stubs. -- GnuPG-bug-id: 4735 Signed-off-by: Werner Koch --- g10/gpgv.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'g10/gpgv.c') diff --git a/g10/gpgv.c b/g10/gpgv.c index 65f5f89c7..9f8dca82f 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -299,10 +299,13 @@ g10_exit( int rc ) * We have to override the trustcheck from pkclist.c because * this utility assumes that all keys in the keyring are trustworthy */ -int -check_signatures_trust (ctrl_t ctrl, PKT_signature *sig) +gpg_error_t +check_signatures_trust (ctrl_t ctrl, kbnode_t kblock, + PKT_public_key *pk, PKT_signature *sig) { (void)ctrl; + (void)kblock; + (void)pk; (void)sig; return 0; } -- cgit v1.2.3