From d4fe2832c9bf1d49b87a301bd0a46caa45018477 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Wed, 12 Aug 2020 15:48:36 +0200 Subject: openpgp: Change accessors to return all issuers. - Unlike the `Signature Creation Time` subpacket, there are legitimate reasons to have multiple `Issuer` subpackets and `Issuer Fingerprint` subpackets. - Rename `SubpacketAreas::issuer` to `SubpacketAreas::issuers` and return all `Issuer` subpackets. - Likewise, Rename `SubpacketAreas::issuer_fingerprint` to `SubpacketAreas::issuer_fingerprints` and return all `Issuer Fingerprint` subpackets. - Change `sq` to list all issuers. Deduplicate first, however. --- openpgp-ffi/src/packet/signature.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openpgp-ffi') diff --git a/openpgp-ffi/src/packet/signature.rs b/openpgp-ffi/src/packet/signature.rs index b6ee4061..d746a13c 100644 --- a/openpgp-ffi/src/packet/signature.rs +++ b/openpgp-ffi/src/packet/signature.rs @@ -53,7 +53,7 @@ fn pgp_signature_into_packet(s: *mut Signature) -> *mut Packet { /// subpacket, this still returns NULL. #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C" fn pgp_signature_issuer(sig: *const Signature) -> Maybe { - sig.ref_raw().issuer().move_into_raw() + sig.ref_raw().issuers().nth(0).move_into_raw() } /// Returns the value of the `Signature` packet's IssuerFingerprint subpacket. @@ -64,7 +64,7 @@ fn pgp_signature_issuer(sig: *const Signature) -> Maybe { #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C" fn pgp_signature_issuer_fingerprint(sig: *const Signature) -> Maybe { - sig.ref_raw().issuer_fingerprint().move_into_raw() + sig.ref_raw().issuer_fingerprints().nth(0).move_into_raw() } -- cgit v1.2.3