From 130eed7cda9f77502bbb181bfabb45934af46a8d Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Wed, 18 Sep 2019 11:01:39 +0200 Subject: openpgp: Combine TPK::expired and its _at variant. - Combine TPK::expired and TPK::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 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'openpgp-ffi/include') diff --git a/openpgp-ffi/include/sequoia/openpgp.h b/openpgp-ffi/include/sequoia/openpgp.h index ff40edbb..ef156c62 100644 --- a/openpgp-ffi/include/sequoia/openpgp.h +++ b/openpgp-ffi/include/sequoia/openpgp.h @@ -812,13 +812,10 @@ pgp_tpk_t pgp_tpk_revoke_in_place (pgp_error_t *errp, /*/ /// Returns whether the TPK has expired. +/// +/// If `when` is 0, then the current time is used. /*/ -int pgp_tpk_expired(pgp_tpk_t tpk); - -/*/ -/// Returns whether the TPK has expired at the specified time. -/*/ -int pgp_tpk_expired_at(pgp_tpk_t tpk, time_t at); +int pgp_tpk_expired(pgp_tpk_t tpk, time_t at); /*/ /// Returns whether the TPK is alive. -- cgit v1.2.3