summaryrefslogtreecommitdiffstats
path: root/ffi
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2019-01-09 14:50:53 +0100
committerJustus Winter <justus@sequoia-pgp.org>2019-01-09 14:50:53 +0100
commit70e1f1bec5acefb3fb2561d07ea53334be2663fc (patch)
tree685719342764c6bcf7a24ab55fa03310db65d2d3 /ffi
parent55643507592c64b9d26d7bb0e6ee02118b46a446 (diff)
ffi: Only return raw pointers.
Diffstat (limited to 'ffi')
-rw-r--r--ffi/src/openpgp/mod.rs2
-rw-r--r--ffi/src/openpgp/tpk.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/ffi/src/openpgp/mod.rs b/ffi/src/openpgp/mod.rs
index 552eb799..15d429ef 100644
--- a/ffi/src/openpgp/mod.rs
+++ b/ffi/src/openpgp/mod.rs
@@ -158,7 +158,7 @@ pub extern "system" fn sq_tsk_free(tsk: *mut TSK) {
/// Returns a reference to the corresponding TPK.
#[no_mangle]
pub extern "system" fn sq_tsk_tpk(tsk: Option<&TSK>)
- -> &TPK {
+ -> *const TPK {
let tsk = ffi_param_ref!(tsk);
tsk.tpk()
}
diff --git a/ffi/src/openpgp/tpk.rs b/ffi/src/openpgp/tpk.rs
index 424b7948..9100867f 100644
--- a/ffi/src/openpgp/tpk.rs
+++ b/ffi/src/openpgp/tpk.rs
@@ -210,9 +210,9 @@ pub extern "system" fn sq_tpk_into_tsk(tpk: *mut TPK)
/// free the key.
#[no_mangle]
pub extern "system" fn sq_tpk_primary(tpk: Option<&TPK>)
- -> Option<&packet::Key> {
+ -> *const packet::Key {
let tpk = ffi_param_ref!(tpk);
- Some(tpk.primary())
+ tpk.primary()
}
/// Returns the TPK's revocation status.