From ef437f8efb1ddef3bd09427274b160e17a5cbf93 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Wed, 18 Sep 2019 10:54:38 +0200 Subject: openpgp: Combine Signature4::key_expired and its _at variant. - Combine Signature4::key_expired and Signature4::key_expired_at. - Use an Into> to distinguish the two previous cases: the current time (None), and a specific time (a time::Tm). --- openpgp-ffi/include/sequoia/openpgp.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'openpgp-ffi/include') diff --git a/openpgp-ffi/include/sequoia/openpgp.h b/openpgp-ffi/include/sequoia/openpgp.h index b7a4f6be..ff40edbb 100644 --- a/openpgp-ffi/include/sequoia/openpgp.h +++ b/openpgp-ffi/include/sequoia/openpgp.h @@ -421,16 +421,13 @@ bool pgp_signature_key_alive(pgp_signature_t signature, pgp_key_t key); bool pgp_signature_key_alive_at(pgp_signature_t signature, pgp_key_t key, time_t when); -/*/ -/// Returns whether the signature is expired. -/*/ -bool pgp_signature_key_expired(pgp_signature_t signature, pgp_key_t key); - /*/ /// Returns whether the signature is expired at the specified time. +/// +/// If `when` is 0, then the current time is used. /*/ -bool pgp_signature_key_expired_at(pgp_signature_t signature, pgp_key_t key, - time_t when); +bool pgp_signature_key_expired(pgp_signature_t signature, pgp_key_t key, + time_t when); /*/ /// Returns the PKESK's recipient. -- cgit v1.2.3