openpgp-ffi: Fix naming.

2 files changed, 10 insertions, 10 deletions

diff --git a/openpgp-ffi/include/sequoia/openpgp.h b/openpgp-ffi/include/sequoia/openpgp.h
index 7a3d0455..169b3d7a 100644
--- a/openpgp-ffi/include/sequoia/openpgp.h
+++ b/openpgp-ffi/include/sequoia/openpgp.h
@@ -795,10 +795,10 @@ pgp_user_id_binding_iter_t pgp_tpk_user_id_binding_iter (pgp_tpk_t tpk);
 /*/
 /// Returns an iterator over the live and unrevoked `Key`s in a TPK.
 ///
-/// Compare with `pgp_tpk_keys_iter_valid`, which doesn'filters out
+/// Compare with `pgp_tpk_key_iter_valid`, which doesn'filters out
 /// expired and revoked keys by default.
 /*/
-pgp_tpk_key_iter_t pgp_tpk_keys_iter_all (pgp_tpk_t tpk);
+pgp_tpk_key_iter_t pgp_tpk_key_iter_all (pgp_tpk_t tpk);
 
 /*/
 /// Returns an iterator over all `Key`s in a TPK.
@@ -816,10 +816,10 @@ pgp_tpk_key_iter_t pgp_tpk_keys_iter_all (pgp_tpk_t tpk);
 ///
 /// A valid `Key` has at least one good self-signature.
 ///
-/// Compare with `pgp_tpk_keys_iter_all`, which doesn't filter out
-/// expired and revoked keys.
+/// Compare with `pgp_tpk_key_iter_all`, which filters out expired and
+/// revoked keys.
 /*/
-pgp_tpk_key_iter_t pgp_tpk_keys_iter_valid (pgp_tpk_t tpk);
+pgp_tpk_key_iter_t pgp_tpk_key_iter_valid (pgp_tpk_t tpk);
 
 /*/
 /// Returns the TPK's primary user id (if any).
diff --git a/openpgp-ffi/src/tpk.rs b/openpgp-ffi/src/tpk.rs
index 39315565..7643d4f7 100644
--- a/openpgp-ffi/src/tpk.rs
+++ b/openpgp-ffi/src/tpk.rs
@@ -456,9 +456,9 @@ pub struct KeyIterWrapper<'a> {
 ///
 /// A valid `Key` has at least one good self-signature.
 ///
-/// To return all keys, use `pgp_tpk_keys_all_iter()`.
+/// To return all keys, use `pgp_tpk_key_iter_all()`.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
-pub extern "system" fn pgp_tpk_keys_iter_valid(tpk: *const TPK)
+pub extern "system" fn pgp_tpk_key_iter_valid(tpk: *const TPK)
     -> *mut KeyIterWrapper<'static>
 {
     let tpk = tpk.ref_raw();
@@ -471,10 +471,10 @@ pub extern "system" fn pgp_tpk_keys_iter_valid(tpk: *const TPK)
 
 /// Returns an iterator over all `Key`s in a TPK.
 ///
-/// Compare with `pgp_tpk_keys_iter_all`, which doesn't filter out
-/// expired and revoked keys by default.
+/// Compare with `pgp_tpk_key_iter_valid`, which filters out expired
+/// and revoked keys by default.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
-pub extern "system" fn pgp_tpk_keys_iter_all(tpk: *const TPK)
+pub extern "system" fn pgp_tpk_key_iter_all(tpk: *const TPK)
     -> *mut KeyIterWrapper<'static>
 {
     let tpk = tpk.ref_raw();