summaryrefslogtreecommitdiffstats
path: root/openpgp-ffi/include
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2019-09-18 10:54:38 +0200
committerNeal H. Walfield <neal@pep.foundation>2019-09-18 11:37:55 +0200
commitef437f8efb1ddef3bd09427274b160e17a5cbf93 (patch)
tree2e3b93f6a37b85ba15977f8896dc99a4bd2854f1 /openpgp-ffi/include
parentd82b21d5ab152ab67ead5c720979320ea20bdb58 (diff)
openpgp: Combine Signature4::key_expired and its _at variant.
- Combine Signature4::key_expired and Signature4::key_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.h11
1 files changed, 4 insertions, 7 deletions
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
@@ -422,15 +422,12 @@ 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.