summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--openpgp-ffi/src/tpk.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/openpgp-ffi/src/tpk.rs b/openpgp-ffi/src/tpk.rs
index 6cacb02f..606a58e6 100644
--- a/openpgp-ffi/src/tpk.rs
+++ b/openpgp-ffi/src/tpk.rs
@@ -13,7 +13,6 @@ use libc::{uint8_t, c_char, c_int, size_t, time_t};
extern crate sequoia_openpgp as openpgp;
use self::openpgp::{
Packet,
- PacketPile,
RevocationStatus,
autocrypt::Autocrypt,
crypto,
@@ -33,6 +32,7 @@ use self::openpgp::{
use ::error::Status;
use super::fingerprint::Fingerprint;
+use super::packet_pile::PacketPile;
use super::tsk::TSK;
use Maybe;
@@ -81,8 +81,7 @@ fn pgp_tpk_from_file(errp: Option<&mut *mut ::error::Error>,
fn pgp_tpk_from_packet_pile(errp: Option<&mut *mut ::error::Error>,
m: *mut PacketPile)
-> Maybe<TPK> {
- let m = ffi_param_move!(m);
- openpgp::TPK::from_packet_pile(*m).move_into_raw(errp)
+ openpgp::TPK::from_packet_pile(m.move_from_raw()).move_into_raw(errp)
}
/// Returns the first TPK found in `buf`.