openpgp: Rename VerificationHelper::get_public_keys to get_certs.

4 files changed, 27 insertions, 27 deletions

diff --git a/openpgp-ffi/examples/decrypt-with.c b/openpgp-ffi/examples/decrypt-with.c
index b6fff7b1..8bdb2d9d 100644
--- a/openpgp-ffi/examples/decrypt-with.c
+++ b/openpgp-ffi/examples/decrypt-with.c
@@ -26,7 +26,7 @@ struct decrypt_cookie {
 };
 
 static pgp_status_t
-get_public_keys_cb (void *cookie_raw,
+get_certs_cb (void *cookie_raw,
                     pgp_keyid_t *keyids, size_t keyids_len,
                     pgp_cert_t **certs, size_t *cert_len,
                     void (**our_free)(void *))
@@ -236,7 +236,7 @@ main (int argc, char **argv)
     .decrypt_called = 0,
   };
   plaintext = pgp_decryptor_new (&err, policy, source,
-                                 get_public_keys_cb, decrypt_cb,
+                                 get_certs_cb, decrypt_cb,
                                  check_cb, NULL, &cookie, 0);
   if (! plaintext)
     error (1, 0, "pgp_decryptor_new: %s", pgp_error_to_string (err));
diff --git a/openpgp-ffi/include/sequoia/openpgp.h b/openpgp-ffi/include/sequoia/openpgp.h
index 624435a0..8651127c 100644
--- a/openpgp-ffi/include/sequoia/openpgp.h
+++ b/openpgp-ffi/include/sequoia/openpgp.h
@@ -1944,7 +1944,7 @@ bool pgp_verification_result_bad_signature (pgp_verification_result_t,
 pgp_reader_t pgp_decryptor_new (pgp_error_t *errp,
     pgp_policy_t policy,
     pgp_reader_t input,
-    pgp_decryptor_get_public_keys_cb_t get_public_keys,
+    pgp_decryptor_get_certs_cb_t get_certs,
     pgp_decryptor_decrypt_cb_t decrypt,
     pgp_decryptor_check_cb_t check,
     pgp_decryptor_inspect_cb_t inspect,
@@ -1959,7 +1959,7 @@ pgp_reader_t pgp_decryptor_new (pgp_error_t *errp,
 pgp_reader_t pgp_verifier_new (pgp_error_t *errp,
     pgp_policy_t policy,
     pgp_reader_t input,
-    pgp_decryptor_get_public_keys_cb_t get_public_keys,
+    pgp_decryptor_get_certs_cb_t get_certs,
     pgp_decryptor_check_cb_t check,
     void *cookie, time_t time);
 
@@ -1969,7 +1969,7 @@ pgp_reader_t pgp_verifier_new (pgp_error_t *errp,
 pgp_detached_verifier_t pgp_detached_verifier_new (pgp_error_t *errp,
     pgp_policy_t policy,
     pgp_reader_t signature_input,
-    pgp_decryptor_get_public_keys_cb_t get_public_keys,
+    pgp_decryptor_get_certs_cb_t get_certs,
     pgp_decryptor_check_cb_t check,
     void *cookie, time_t time);
 
diff --git a/openpgp-ffi/include/sequoia/openpgp/types.h b/openpgp-ffi/include/sequoia/openpgp/types.h
index 74b4f1d6..b77e4251 100644
--- a/openpgp-ffi/include/sequoia/openpgp/types.h
+++ b/openpgp-ffi/include/sequoia/openpgp/types.h
@@ -519,7 +519,7 @@ typedef enum pgp_verification_result_variant {
   PGP_VERIFICATION_RESULT_CODE_FORCE_WIDTH = INT_MAX,
 } pgp_verification_result_variant_t;
 
-typedef pgp_status_t (*pgp_decryptor_get_public_keys_cb_t) (void *,
+typedef pgp_status_t (*pgp_decryptor_get_certs_cb_t) (void *,
     pgp_keyid_t *, size_t,
     pgp_cert_t **, size_t *,
     void (**free)(void *));
diff --git a/openpgp-ffi/src/parse/stream.rs b/openpgp-ffi/src/parse/stream.rs
index 27f388c3..c3d54ec3 100644
--- a/openpgp-ffi/src/parse/stream.rs
+++ b/openpgp-ffi/src/parse/stream.rs
@@ -429,19 +429,19 @@ type CheckCallback = fn(*mut HelperCookie,
 
 // This fetches keys and computes the validity of the verification.
 struct VHelper {
-    get_public_keys_cb: GetPublicKeysCallback,
+    get_certs_cb: GetPublicKeysCallback,
     check_signatures_cb: CheckCallback,
     cookie: *mut HelperCookie,
 }
 
 impl VHelper {
-    fn new(get_public_keys: GetPublicKeysCallback,
+    fn new(get_certs: GetPublicKeysCallback,
            check_signatures: CheckCallback,
            cookie: *mut HelperCookie)
        -> Self
     {
         VHelper {
-            get_public_keys_cb: get_public_keys,
+            get_certs_cb: get_certs,
             check_signatures_cb: check_signatures,
             cookie,
         }
@@ -449,7 +449,7 @@ impl VHelper {
 }
 
 impl VerificationHelper for VHelper {
-    fn get_public_keys(&mut self, ids: &[openpgp::KeyHandle])
+    fn get_certs(&mut self, ids: &[openpgp::KeyHandle])
         -> Result<Vec<openpgp::Cert>, anyhow::Error>
     {
         // The size of ID is not known in C.  Convert to KeyID, and
@@ -463,7 +463,7 @@ impl VerificationHelper for VHelper {
 
         let mut free : FreeCallback = |_| {};
 
-        let result = (self.get_public_keys_cb)(
+        let result = (self.get_certs_cb)(
             self.cookie,
             ids.as_ptr(), ids.len(),
             &mut cert_refs_raw, &mut cert_refs_raw_len as *mut usize,
@@ -535,7 +535,7 @@ impl VerificationHelper for VHelper {
 /// };
 ///
 /// static pgp_status_t
-/// get_public_keys_cb (void *cookie_opaque,
+/// get_certs_cb (void *cookie_opaque,
 ///                     pgp_keyid_t *keyids, size_t keyids_len,
 ///                     pgp_cert_t **certs, size_t *certs_len,
 ///                     void (**our_free)(void *))
@@ -600,7 +600,7 @@ impl VerificationHelper for VHelper {
 ///     .key = cert,  /* Move.  */
 ///   };
 ///   plaintext = pgp_verifier_new (NULL, policy, source,
-///                                 get_public_keys_cb, check_cb,
+///                                 get_certs_cb, check_cb,
 ///                                 &cookie, 1554542219);
 ///   assert (source);
 ///
@@ -619,14 +619,14 @@ impl VerificationHelper for VHelper {
 fn pgp_verifier_new<'a>(errp: Option<&mut *mut crate::error::Error>,
                         policy: *const Policy,
                         input: *mut io::Reader,
-                        get_public_keys: GetPublicKeysCallback,
+                        get_certs: GetPublicKeysCallback,
                         check: CheckCallback,
                         cookie: *mut HelperCookie,
                         time: time_t)
                         -> Maybe<io::Reader>
 {
     let policy = policy.ref_raw().as_ref();
-    let helper = VHelper::new(get_public_keys, check, cookie);
+    let helper = VHelper::new(get_certs, check, cookie);
 
     Verifier::from_reader(policy, input.ref_mut_raw(), helper, maybe_time(time))
         .map(|r| io::ReaderKind::Generic(Box::new(r)))
@@ -661,7 +661,7 @@ pub struct DetachedVerifier(openpgp::parse::stream::DetachedVerifier<'static, VH
 /// };
 ///
 /// static pgp_status_t
-/// get_public_keys_cb (void *cookie_opaque,
+/// get_certs_cb (void *cookie_opaque,
 ///                     pgp_keyid_t *keyids, size_t keyids_len,
 ///                     pgp_cert_t **certs, size_t *certs_len,
 ///                     void (**our_free)(void *))
@@ -728,7 +728,7 @@ pub struct DetachedVerifier(openpgp::parse::stream::DetachedVerifier<'static, VH
 ///     .key = cert,  /* Move.  */
 ///   };
 ///   verifier = pgp_detached_verifier_new (NULL, policy, signature,
-///     get_public_keys_cb, check_cb,
+///     get_certs_cb, check_cb,
 ///     &cookie, 1554542219);
 ///   assert (verifier);
 ///
@@ -746,7 +746,7 @@ pub struct DetachedVerifier(openpgp::parse::stream::DetachedVerifier<'static, VH
 fn pgp_detached_verifier_new<'a>(errp: Option<&mut *mut crate::error::Error>,
                                  policy: *const Policy,
                                  signature_input: *mut io::Reader,
-                                 get_public_keys: GetPublicKeysCallback,
+                                 get_certs: GetPublicKeysCallback,
                                  check: CheckCallback,
                                  cookie: *mut HelperCookie,
                                  time: time_t)
@@ -754,7 +754,7 @@ fn pgp_detached_verifier_new<'a>(errp: Option<&mut *mut crate::error::Error>,
 {
     let policy = policy.ref_raw().as_ref();
 
-    let helper = VHelper::new(get_public_keys, check, cookie);
+    let helper = VHelper::new(get_certs, check, cookie);
 
     openpgp::parse::stream::DetachedVerifier::from_reader(
         policy, signature_input.ref_mut_raw(), helper, maybe_time(time))
@@ -783,7 +783,7 @@ struct DHelper {
 }
 
 impl DHelper {
-    fn new(get_public_keys: GetPublicKeysCallback,
+    fn new(get_certs: GetPublicKeysCallback,
            decrypt: DecryptCallback,
            check: CheckCallback,
            inspect: Option<InspectCallback>,
@@ -791,7 +791,7 @@ impl DHelper {
        -> Self
     {
         DHelper {
-            vhelper: VHelper::new(get_public_keys, check, cookie),
+            vhelper: VHelper::new(get_certs, check, cookie),
             inspect_cb: inspect,
             decrypt_cb: decrypt,
         }
@@ -799,10 +799,10 @@ impl DHelper {
 }
 
 impl VerificationHelper for DHelper {
-    fn get_public_keys(&mut self, ids: &[openpgp::KeyHandle])
+    fn get_certs(&mut self, ids: &[openpgp::KeyHandle])
         -> Result<Vec<openpgp::Cert>, anyhow::Error>
     {
-        self.vhelper.get_public_keys(ids)
+        self.vhelper.get_certs(ids)
     }
 
     fn check(&mut self, structure: stream::MessageStructure)
@@ -913,7 +913,7 @@ impl DecryptionHelper for DHelper {
 /// };
 ///
 /// static pgp_status_t
-/// get_public_keys_cb (void *cookie_raw,
+/// get_certs_cb (void *cookie_raw,
 ///                     pgp_keyid_t *keyids, size_t keyids_len,
 ///                     pgp_cert_t **certs, size_t *cert_len,
 ///                     void (**our_free)(void *))
@@ -1023,7 +1023,7 @@ impl DecryptionHelper for DHelper {
 ///     .decrypt_called = 0,
 ///   };
 ///   plaintext = pgp_decryptor_new (NULL, policy, source,
-///                                  get_public_keys_cb, decrypt_cb,
+///                                  get_certs_cb, decrypt_cb,
 ///                                  check_cb, NULL, &cookie, 1554542219);
 ///   assert (plaintext);
 ///
@@ -1043,7 +1043,7 @@ impl DecryptionHelper for DHelper {
 fn pgp_decryptor_new<'a>(errp: Option<&mut *mut crate::error::Error>,
                          policy: *const Policy,
                          input: *mut io::Reader,
-                         get_public_keys: GetPublicKeysCallback,
+                         get_certs: GetPublicKeysCallback,
                          decrypt: DecryptCallback,
                          check: CheckCallback,
                          inspect: Option<InspectCallback>,
@@ -1053,7 +1053,7 @@ fn pgp_decryptor_new<'a>(errp: Option<&mut *mut crate::error::Error>,
 {
     let policy = policy.ref_raw().as_ref();
     let helper = DHelper::new(
-        get_public_keys, decrypt, check, inspect, cookie);
+        get_certs, decrypt, check, inspect, cookie);
 
     Decryptor::from_reader(policy, input.ref_mut_raw(), helper, maybe_time(time))
         .map(|r| io::ReaderKind::Generic(Box::new(r)))