summaryrefslogtreecommitdiffstats
path: root/openpgp-ffi/include
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2019-09-18 11:01:39 +0200
committerNeal H. Walfield <neal@pep.foundation>2019-09-18 11:55:58 +0200
commit130eed7cda9f77502bbb181bfabb45934af46a8d (patch)
tree13a9f042f6b2dde14e595658e1b1990f5969d380 /openpgp-ffi/include
parentef437f8efb1ddef3bd09427274b160e17a5cbf93 (diff)
openpgp: Combine TPK::expired and its _at variant.
- Combine TPK::expired and TPK::expired_at. - Use an Into<Option<time::Tm>> to distinguish the two previous cases: the current time (None), and a specific time (a time::Tm).
Diffstat (limited to 'openpgp-ffi/include')
-rw-r--r--openpgp-ffi/include/sequoia/openpgp.h9
1 files changed, 3 insertions, 6 deletions
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.