summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--guide/src/chapter_01.md8
-rw-r--r--guide/src/chapter_02.md8
-rw-r--r--ipc/examples/gpg-agent-decrypt.rs2
-rw-r--r--ipc/tests/gpg-agent.rs4
-rw-r--r--openpgp-ffi/examples/decrypt-with.c4
-rw-r--r--openpgp-ffi/include/sequoia/openpgp.h6
-rw-r--r--openpgp-ffi/include/sequoia/openpgp/types.h2
-rw-r--r--openpgp-ffi/src/parse/stream.rs42
-rw-r--r--openpgp/examples/decrypt-with.rs2
-rw-r--r--openpgp/examples/generate-encrypt-decrypt.rs2
-rw-r--r--openpgp/examples/generate-sign-verify.rs2
-rw-r--r--openpgp/src/parse/stream.rs20
-rw-r--r--openpgp/src/policy.rs8
-rw-r--r--openpgp/src/serialize/stream.rs6
-rw-r--r--sqv/src/sqv.rs2
-rw-r--r--tool/src/commands/decrypt.rs4
-rw-r--r--tool/src/commands/mod.rs2
17 files changed, 62 insertions, 62 deletions
diff --git a/guide/src/chapter_01.md b/guide/src/chapter_01.md
index e2c2a88f..c65a2a75 100644
--- a/guide/src/chapter_01.md
+++ b/guide/src/chapter_01.md
@@ -105,7 +105,7 @@ fn main() {
# }
#
# 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()])
@@ -253,7 +253,7 @@ fn generate() -> openpgp::Result<openpgp::Cert> {
# }
#
# 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()])
@@ -401,7 +401,7 @@ fn sign(policy: &dyn Policy,
# }
#
# 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()])
@@ -560,7 +560,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/guide/src/chapter_02.md b/guide/src/chapter_02.md
index 92abd895..1990ac8a 100644
--- a/guide/src/chapter_02.md
+++ b/guide/src/chapter_02.md
@@ -108,7 +108,7 @@ fn main() {
# }
#
# 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())
@@ -255,7 +255,7 @@ fn generate() -> openpgp::Result<openpgp::Cert> {
# }
#
# 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())
@@ -402,7 +402,7 @@ fn encrypt(policy: &dyn Policy,
# }
#
# 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())
@@ -563,7 +563,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/ipc/examples/gpg-agent-decrypt.rs b/ipc/examples/gpg-agent-decrypt.rs
index bd524e80..163a83fb 100644
--- a/ipc/examples/gpg-agent-decrypt.rs
+++ b/ipc/examples/gpg-agent-decrypt.rs
@@ -121,7 +121,7 @@ impl<'a> DecryptionHelper for 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>> {
Ok(Vec::new()) // Feed the Certs to the verifier here.
}
diff --git a/ipc/tests/gpg-agent.rs b/ipc/tests/gpg-agent.rs
index 5af03024..3048a136 100644
--- a/ipc/tests/gpg-agent.rs
+++ b/ipc/tests/gpg-agent.rs
@@ -145,7 +145,7 @@ fn sign() {
}
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()])
@@ -253,7 +253,7 @@ fn decrypt() {
}
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-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)))
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> Sign