summaryrefslogtreecommitdiffstats
path: root/openpgp-ffi/src
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2020-02-27 09:50:13 +0100
committerNeal H. Walfield <neal@pep.foundation>2020-02-27 09:50:48 +0100
commit95d986f75418748c91b85911d922f605fb2facd0 (patch)
treee0d6c36c0169461be6be3f5331987aee3de27be8 /openpgp-ffi/src
parenta5bfdd6c2f560b91cfdea3e89102d16e441fd4e2 (diff)
openpgp: Make KeyIter and ValidKeyIter generic over the key's role.
Diffstat (limited to 'openpgp-ffi/src')
-rw-r--r--openpgp-ffi/src/cert.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/openpgp-ffi/src/cert.rs b/openpgp-ffi/src/cert.rs
index 81b19123..a1c42337 100644
--- a/openpgp-ffi/src/cert.rs
+++ b/openpgp-ffi/src/cert.rs
@@ -435,7 +435,8 @@ pub extern "C" fn pgp_user_id_bundle_iter_next<'a>(
/// Wraps a KeyIter for export via the FFI.
pub struct KeyIterWrapper<'a> {
pub(crate) // For serialize.rs.
- iter: KeyIter<'a, openpgp::packet::key::PublicParts>,
+ iter: KeyIter<'a, openpgp::packet::key::PublicParts,
+ openpgp::packet::key::UnspecifiedRole>,
// Whether next has been called.
next_called: bool,
}
@@ -555,7 +556,8 @@ pub extern "C" fn pgp_cert_key_iter_next<'a>(
/// Wraps a ValidKeyIter for export via the FFI.
pub struct ValidKeyIterWrapper<'a> {
pub(crate) // For serialize.rs.
- iter: ValidKeyIter<'a, openpgp::packet::key::PublicParts>,
+ iter: ValidKeyIter<'a, openpgp::packet::key::PublicParts,
+ openpgp::packet::key::UnspecifiedRole>,
// Whether next has been called.
next_called: bool,
}