openpgp: Rename VerificationHelper::get_public_keys to get_certs.

6 files changed, 20 insertions, 20 deletions

diff --git a/openpgp/examples/decrypt-with.rs b/openpgp/examples/decrypt-with.rs
index 336a85b3..4360ddc0 100644
--- a/openpgp/examples/decrypt-with.rs
+++ b/openpgp/examples/decrypt-with.rs
@@ -102,7 +102,7 @@ impl DecryptionHelper for Helper {
 }
 
 impl VerificationHelper for Helper {
-    fn get_public_keys(&mut self, _ids: &[openpgp::KeyHandle])
+    fn get_certs(&mut self, _ids: &[openpgp::KeyHandle])
                        -> openpgp::Result<Vec<openpgp::Cert>> {
         Ok(Vec::new()) // Feed the Certs to the verifier here.
     }
diff --git a/openpgp/examples/generate-encrypt-decrypt.rs b/openpgp/examples/generate-encrypt-decrypt.rs
index a5a49f0b..e735caed 100644
--- a/openpgp/examples/generate-encrypt-decrypt.rs
+++ b/openpgp/examples/generate-encrypt-decrypt.rs
@@ -100,7 +100,7 @@ struct Helper<'a> {
 }
 
 impl<'a> VerificationHelper for Helper<'a> {
-    fn get_public_keys(&mut self, _ids: &[openpgp::KeyHandle])
+    fn get_certs(&mut self, _ids: &[openpgp::KeyHandle])
                        -> openpgp::Result<Vec<openpgp::Cert>> {
         // Return public keys for signature verification here.
         Ok(Vec::new())
diff --git a/openpgp/examples/generate-sign-verify.rs b/openpgp/examples/generate-sign-verify.rs
index 294fd69d..ae4f174f 100644
--- a/openpgp/examples/generate-sign-verify.rs
+++ b/openpgp/examples/generate-sign-verify.rs
@@ -92,7 +92,7 @@ struct Helper<'a> {
 }
 
 impl<'a> VerificationHelper for Helper<'a> {
-    fn get_public_keys(&mut self, _ids: &[openpgp::KeyHandle])
+    fn get_certs(&mut self, _ids: &[openpgp::KeyHandle])
                        -> openpgp::Result<Vec<openpgp::Cert>> {
         // Return public keys for signature verification here.
         Ok(vec![self.cert.clone()])
diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs
index 1189233a..865912c8 100644
--- a/openpgp/src/parse/stream.rs
+++ b/openpgp/src/parse/stream.rs
@@ -421,7 +421,7 @@ pub trait VerificationHelper {
     /// a subset of them may be sufficient.
     ///
     /// This method will be called at most once per message.
-    fn get_public_keys(&mut self, ids: &[crate::KeyHandle]) -> Result<Vec<Cert>>;
+    fn get_certs(&mut self, ids: &[crate::KeyHandle]) -> Result<Vec<Cert>>;
 
     /// Conveys the message structure.
     ///
@@ -452,9 +452,9 @@ struct NoDecryptionHelper<V: VerificationHelper> {
 }
 
 impl<V: VerificationHelper> VerificationHelper for NoDecryptionHelper<V> {
-    fn get_public_keys(&mut self, ids: &[crate::KeyHandle]) -> Result<Vec<Cert>>
+    fn get_certs(&mut self, ids: &[crate::KeyHandle]) -> Result<Vec<Cert>>
     {
-        self.v.get_public_keys(ids)
+        self.v.get_certs(ids)
     }
     fn check(&mut self, structure: MessageStructure) -> Result<()>
     {
@@ -507,7 +507,7 @@ impl<V: VerificationHelper> DecryptionHelper for NoDecryptionHelper<V> {
 /// // This fetches keys and computes the validity of the verification.
 /// struct Helper {};
 /// impl VerificationHelper for Helper {
-///     fn get_public_keys(&mut self, _ids: &[openpgp::KeyHandle]) -> Result<Vec<Cert>> {
+///     fn get_certs(&mut self, _ids: &[openpgp::KeyHandle]) -> Result<Vec<Cert>> {
 ///         Ok(Vec::new()) // Feed the Certs to the verifier here...
 ///     }
 ///     fn check(&mut self, structure: MessageStructure) -> Result<()> {
@@ -666,7 +666,7 @@ impl<'a, H: VerificationHelper> io::Read for Verifier<'a, H> {
 /// // This fetches keys and computes the validity of the verification.
 /// struct Helper {};
 /// impl VerificationHelper for Helper {
-///     fn get_public_keys(&mut self, _ids: &[openpgp::KeyHandle]) -> Result<Vec<Cert>> {
+///     fn get_certs(&mut self, _ids: &[openpgp::KeyHandle]) -> Result<Vec<Cert>> {
 ///         Ok(Vec::new()) // Feed the Certs to the verifier here...
 ///     }
 ///     fn check(&mut self, structure: MessageStructure) -> Result<()> {
@@ -858,7 +858,7 @@ enum Mode {
 /// // This fetches keys and computes the validity of the verification.
 /// struct Helper {};
 /// impl VerificationHelper for Helper {
-///     fn get_public_keys(&mut self, _ids: &[openpgp::KeyHandle]) -> Result<Vec<Cert>> {
+///     fn get_certs(&mut self, _ids: &[openpgp::KeyHandle]) -> Result<Vec<Cert>> {
 ///         Ok(Vec::new()) // Feed the Certs to the verifier here...
 ///     }
 ///     fn check(&mut self, structure: MessageStructure) -> Result<()> {
@@ -1165,7 +1165,7 @@ impl<'a, H: VerificationHelper + DecryptionHelper> Decryptor<'a, H> {
                 Packet::Literal(_) => {
                     v.structure.insert_missing_signature_group();
                     // Query keys.
-                    v.certs = v.helper.get_public_keys(&issuers)?;
+                    v.certs = v.helper.get_certs(&issuers)?;
                     v.oppr = Some(PacketParserResult::Some(pp));
                     v.finish_maybe()?;
 
@@ -1206,7 +1206,7 @@ impl<'a, H: VerificationHelper + DecryptionHelper> Decryptor<'a, H> {
         }
 
         if v.mode == Mode::VerifyDetached {
-            v.certs = v.helper.get_public_keys(&issuers)?;
+            v.certs = v.helper.get_certs(&issuers)?;
             return Ok(v);
         }
 
@@ -1612,7 +1612,7 @@ mod test {
     }
 
     impl VerificationHelper for VHelper {
-        fn get_public_keys(&mut self, _ids: &[crate::KeyHandle]) -> Result<Vec<Cert>> {
+        fn get_certs(&mut self, _ids: &[crate::KeyHandle]) -> Result<Vec<Cert>> {
             Ok(self.keys.clone())
         }
 
@@ -1745,7 +1745,7 @@ mod test {
 
         struct VHelper(());
         impl VerificationHelper for VHelper {
-            fn get_public_keys(&mut self, _ids: &[crate::KeyHandle])
+            fn get_certs(&mut self, _ids: &[crate::KeyHandle])
                                -> Result<Vec<Cert>> {
                 Ok(Vec::new())
             }
diff --git a/openpgp/src/policy.rs b/openpgp/src/policy.rs
index ca0b3f2b..fe386268 100644
--- a/openpgp/src/policy.rs
+++ b/openpgp/src/policy.rs
@@ -1170,7 +1170,7 @@ mod test {
         }
 
         impl VerificationHelper for VHelper {
-            fn get_public_keys(&mut self, _ids: &[crate::KeyHandle])
+            fn get_certs(&mut self, _ids: &[crate::KeyHandle])
                 -> Result<Vec<Cert>>
             {
                 Ok(self.keys.clone())
@@ -1632,7 +1632,7 @@ mod test {
         }
 
         impl VerificationHelper for VHelper {
-            fn get_public_keys(&mut self, _ids: &[crate::KeyHandle])
+            fn get_certs(&mut self, _ids: &[crate::KeyHandle])
                 -> Result<Vec<Cert>>
             {
                 Ok(self.keys.clone())
@@ -1770,7 +1770,7 @@ mod test {
         #[derive(PartialEq, Debug)]
         struct Helper {}
         impl VerificationHelper for Helper {
-            fn get_public_keys(&mut self, _: &[crate::KeyHandle])
+            fn get_certs(&mut self, _: &[crate::KeyHandle])
                 -> Result<Vec<Cert>> {
                 unreachable!()
             }
@@ -1816,7 +1816,7 @@ mod test {
     fn reject_cipher() {
         struct Helper {}
         impl VerificationHelper for Helper {
-            fn get_public_keys(&mut self, _: &[crate::KeyHandle])
+            fn get_certs(&mut self, _: &[crate::KeyHandle])
                 -> Result<Vec<Cert>> {
                 Ok(Default::default())
             }
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs
index eef5512f..6ccbc116 100644
--- a/openpgp/src/serialize/stream.rs
+++ b/openpgp/src/serialize/stream.rs
@@ -272,7 +272,7 @@ impl<'a> Signer<'a> {
     /// // Now check the signature.
     /// struct Helper<'a>(&'a openpgp::Cert);
     /// impl<'a> VerificationHelper for Helper<'a> {
-    ///     fn get_public_keys(&mut self, _: &[openpgp::KeyHandle])
+    ///     fn get_certs(&mut self, _: &[openpgp::KeyHandle])
     ///                        -> openpgp::Result<Vec<openpgp::Cert>> {
     ///         Ok(vec![self.0.clone()])
     ///     }
@@ -383,7 +383,7 @@ impl<'a> Signer<'a> {
     /// // Now check the signature.
     /// struct Helper<'a>(&'a openpgp::Cert);
     /// impl<'a> VerificationHelper for Helper<'a> {
-    ///     fn get_public_keys(&mut self, _: &[openpgp::KeyHandle])
+    ///     fn get_certs(&mut self, _: &[openpgp::KeyHandle])
     ///                        -> openpgp::Result<Vec<openpgp::Cert>> {
     ///         Ok(vec![self.0.clone()])
     ///     }
@@ -1709,7 +1709,7 @@ mod test {
             tsk: &'a Cert,
         };
         impl<'a> VerificationHelper for Helper<'a> {
-            fn get_public_keys(&mut self, _ids: &[crate::KeyHandle])
+            fn get_certs(&mut self, _ids: &[crate::KeyHandle])
                                -> Result<Vec<Cert>> {
                 Ok(Vec::new())
             }