From f078f93025b517609d25ce2cb2ebc41a01d81190 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Fri, 20 Dec 2019 14:22:09 +0100 Subject: openpgp: Simplify key iteration interface. - Cert::keys_valid() is just a short-cut for Cert::keys_all().alive().revoked(false). - Remove Cert::keys_valid() and rename Cert::keys_all() to Cert::keys(). --- openpgp-ffi/examples/decrypt-with.c | 2 +- openpgp-ffi/examples/encrypt-for.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'openpgp-ffi/examples') diff --git a/openpgp-ffi/examples/decrypt-with.c b/openpgp-ffi/examples/decrypt-with.c index 423106bd..c85b96f8 100644 --- a/openpgp-ffi/examples/decrypt-with.c +++ b/openpgp-ffi/examples/decrypt-with.c @@ -155,7 +155,7 @@ decrypt_cb (void *cookie_opaque, pgp_pkesk_t pkesk = pkesks[i]; pgp_keyid_t keyid = pgp_pkesk_recipient (pkesk); - pgp_cert_key_iter_t key_iter = pgp_cert_key_iter_all (cookie->key); + pgp_cert_key_iter_t key_iter = pgp_cert_key_iter (cookie->key); pgp_key_t key; while ((key = pgp_cert_key_iter_next (key_iter, NULL, NULL))) { pgp_keyid_t this_keyid = pgp_key_keyid (key); diff --git a/openpgp-ffi/examples/encrypt-for.c b/openpgp-ffi/examples/encrypt-for.c index 8303f8ee..65bd8a45 100644 --- a/openpgp-ffi/examples/encrypt-for.c +++ b/openpgp-ffi/examples/encrypt-for.c @@ -36,7 +36,9 @@ main (int argc, char **argv) if (cert == NULL) error (1, 0, "pgp_cert_from_file: %s", pgp_error_to_string (err)); - pgp_cert_key_iter_t iter = pgp_cert_key_iter_valid (cert); + pgp_cert_key_iter_t iter = pgp_cert_key_iter (cert); + pgp_cert_key_iter_alive (iter); + pgp_cert_key_iter_revoked (iter, false); pgp_cert_key_iter_for_storage_encryption (iter); pgp_cert_key_iter_for_transport_encryption (iter); size_t recipients_len; -- cgit v1.2.3