openpgp: Rename TPK::revocation_status to TPK::revoked.

  - Combine TPK::revocation_status and TPK::revocation_status_at; only
    keep the version with the optional time parameter.

  - Rename TPK::revocation_status to TPK::revoked to match
    KeyBinding::revoked, UserIDBinding::revoked, and
    UserAttributeBinding::revoked.

  - Do the same for the C API.

1 files changed, 4 insertions, 11 deletions

diff --git a/openpgp-ffi/include/sequoia/openpgp.h b/openpgp-ffi/include/sequoia/openpgp.h
index 8662fef1..b7a4f6be 100644
--- a/openpgp-ffi/include/sequoia/openpgp.h
+++ b/openpgp-ffi/include/sequoia/openpgp.h
@@ -780,23 +780,16 @@ pgp_tsk_t pgp_tpk_as_tsk (pgp_tpk_t tpk);
 pgp_key_t pgp_tpk_primary_key (pgp_tpk_t tpk);
 
 /*/
-/// Returns the TPK's current revocation status.
-///
-/// Note: this only returns whether the TPK has been revoked, and does
-/// not reflect whether an individual user id, user attribute or
-/// subkey has been revoked.
-/*/
-pgp_revocation_status_t pgp_tpk_revocation_status (pgp_tpk_t tpk);
-
-/*/
 /// Returns the TPK's revocation status at the specified time.
 ///
 /// Note: this only returns whether the TPK has been revoked, and does
 /// not reflect whether an individual user id, user attribute or
 /// subkey has been revoked.
+///
+/// If `when` is 0, then returns the TPK's revocation status as of the
+/// time of the call.
 /*/
-pgp_revocation_status_t pgp_tpk_revocation_status_at (pgp_tpk_t tpk,
-                                                      time_t when);
+pgp_revocation_status_t pgp_tpk_revoked (pgp_tpk_t tpk, time_t when);
 
 /*/
 /// Writes a revocation certificate to the writer.