diff options
Diffstat (limited to 'openpgp-ffi/src')
-rw-r--r-- | openpgp-ffi/src/amalgamation.rs | 2 | ||||
-rw-r--r-- | openpgp-ffi/src/cert.rs | 10 | ||||
-rw-r--r-- | openpgp-ffi/src/key_amalgamation.rs | 2 | ||||
-rw-r--r-- | openpgp-ffi/src/parse/stream.rs | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/openpgp-ffi/src/amalgamation.rs b/openpgp-ffi/src/amalgamation.rs index c737da0c..7f75751d 100644 --- a/openpgp-ffi/src/amalgamation.rs +++ b/openpgp-ffi/src/amalgamation.rs @@ -77,7 +77,7 @@ pub extern "C" fn pgp_valid_user_id_amalgamation_revocation_status<'a>(ua: *cons -> *mut RevocationStatus<'a> { ua.ref_raw() - .revoked() + .revocation_status() .move_into_raw() } diff --git a/openpgp-ffi/src/cert.rs b/openpgp-ffi/src/cert.rs index d51d29ad..3237e126 100644 --- a/openpgp-ffi/src/cert.rs +++ b/openpgp-ffi/src/cert.rs @@ -159,12 +159,12 @@ fn pgp_cert_primary_key(cert: *const Cert) -> *const Key { /// If `when` is 0, then returns the Cert's revocation status as of the /// time of the call. #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C" -fn pgp_cert_revoked(cert: *const Cert, policy: *const Policy, when: time_t) +fn pgp_cert_revocation_status(cert: *const Cert, policy: *const Policy, when: time_t) -> *mut RevocationStatus<'static> { let policy = &**policy.ref_raw(); cert.ref_raw() - .revoked(policy, maybe_time(when)) + .revocation_status(policy, maybe_time(when)) .move_into_raw() } @@ -222,7 +222,7 @@ fn int_to_reason_for_revocation(code: c_int) -> ReasonForRevocation { /// cert = pgp_cert_merge_packets (NULL, cert, &packet, 1); /// assert (cert); /// -/// pgp_revocation_status_t rs = pgp_cert_revoked (cert, policy, 0); +/// pgp_revocation_status_t rs = pgp_cert_revocation_status (cert, policy, 0); /// assert (pgp_revocation_status_variant (rs) == PGP_REVOCATION_STATUS_REVOKED); /// pgp_revocation_status_free (rs); /// @@ -290,7 +290,7 @@ fn pgp_cert_revoke(errp: Option<&mut *mut crate::error::Error>, /// pgp_signer_free (primary_signer); /// pgp_key_pair_free (primary_keypair); /// -/// pgp_revocation_status_t rs = pgp_cert_revoked (cert, policy, 0); +/// pgp_revocation_status_t rs = pgp_cert_revocation_status (cert, policy, 0); /// assert (pgp_revocation_status_variant (rs) == PGP_REVOCATION_STATUS_REVOKED); /// pgp_revocation_status_free (rs); /// @@ -837,7 +837,7 @@ pub extern "C" fn pgp_cert_valid_key_iter_next<'a>( if let Some(ka) = iter_wrapper.iter.as_mut().unwrap().next() { let sig = ka.binding_signature(); - let rs = ka.revoked(); + let rs = ka.revocation_status(); if let Some(ptr) = sigo { *ptr = sig.move_into_raw(); diff --git a/openpgp-ffi/src/key_amalgamation.rs b/openpgp-ffi/src/key_amalgamation.rs index 1c5ff534..0b661533 100644 --- a/openpgp-ffi/src/key_amalgamation.rs +++ b/openpgp-ffi/src/key_amalgamation.rs @@ -83,7 +83,7 @@ pub extern "C" fn pgp_valid_key_amalgamation_revocation_status<'a>(ka: *const Va -> *mut RevocationStatus<'a> { ka.ref_raw() - .revoked() + .revocation_status() .move_into_raw() } diff --git a/openpgp-ffi/src/parse/stream.rs b/openpgp-ffi/src/parse/stream.rs index fab833c9..9e23cb47 100644 --- a/openpgp-ffi/src/parse/stream.rs +++ b/openpgp-ffi/src/parse/stream.rs @@ -216,7 +216,7 @@ fn pgp_verification_result_good_checksum<'a>( ka.binding_signature().move_into_raw(); } if let Some(mut p) = revocation_status_r { - *unsafe { p.as_mut() } = ka.revoked().move_into_raw(); + *unsafe { p.as_mut() } = ka.revocation_status().move_into_raw(); } true } else { @@ -344,7 +344,7 @@ fn $fn_name<'a>( ka.binding_signature().move_into_raw(); } if let Some(mut p) = revocation_status_r { - *unsafe { p.as_mut() } = ka.revoked().move_into_raw(); + *unsafe { p.as_mut() } = ka.revocation_status().move_into_raw(); } if let Some(mut p) = error_r { *unsafe { p.as_mut() } = error.move_into_raw(); |