From 858909168298e8c6fb6f9f9009be2ee2d0d9f0ec Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 15 Jul 2020 16:34:24 +0200 Subject: core: Deprecate the non-working trustlist functions. * src/gpgme.h.in: Clarify that the trustlist function should not be used. * src/engine.c (_gpgme_engine_op_trustlist): Always return an error. * src/engine-backend.h (struct engine_ops): Remove trustlist member. * src/engine-gpg.c (gpg_trustlist): Remove. (struct engine_ops): Remove that member. Also in all other engines. * tests/gpg/t-trustlist.c: Remove. * lang/python/tests/t-trustlist.py: Remove. -- This never worked in reality because the required feature has been removed from GnuPG version 1.3.2 soon after introduction of this feature in gpgme - 17 years ago. It was anyway marked as experimental. We keep the API and ABI, though. GnuPG-bug-id: 4834 Signed-off-by: Werner Koch --- src/engine-gpg.c | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'src/engine-gpg.c') diff --git a/src/engine-gpg.c b/src/engine-gpg.c index c343e80e..9362e297 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -3302,29 +3302,6 @@ gpg_sign (void *engine, gpgme_data_t in, gpgme_data_t out, return err; } -static gpgme_error_t -gpg_trustlist (void *engine, const char *pattern) -{ - engine_gpg_t gpg = engine; - gpgme_error_t err; - - err = add_arg (gpg, "--with-colons"); - if (!err) - err = add_arg (gpg, "--list-trust-path"); - - /* Tell the gpg object about the data. */ - if (!err) - err = add_arg (gpg, "--"); - if (!err) - err = add_arg (gpg, pattern); - - if (!err) - err = start (gpg); - - return err; -} - - static gpgme_error_t gpg_verify (void *engine, gpgme_data_t sig, gpgme_data_t signed_text, gpgme_data_t plaintext, gpgme_ctx_t ctx) @@ -3475,7 +3452,6 @@ struct engine_ops _gpgme_engine_ops_gpg = gpg_keysign, gpg_tofu_policy, /* tofu_policy */ gpg_sign, - gpg_trustlist, gpg_verify, gpg_getauditlog, NULL, /* opassuan_transact */ -- cgit v1.2.3