openpgp-ffi: Convert KeyID.

2 files changed, 8 insertions, 5 deletions

diff --git a/ffi/src/net.rs b/ffi/src/net.rs
index 8a0cf600..9c462f4e 100644
--- a/ffi/src/net.rs
+++ b/ffi/src/net.rs
@@ -35,11 +35,12 @@ use std::slice;
 extern crate sequoia_openpgp as openpgp;
 
 use self::openpgp::TPK;
-use self::openpgp::KeyID;
 use sequoia_net::KeyServer;
 
 use super::error::Status;
 use super::core::Context;
+use ::openpgp::keyid::KeyID;
+use ::RefRaw;
 
 /// Returns a handle for the given URI.
 ///
@@ -118,7 +119,7 @@ pub extern "system" fn sq_keyserver_get(ctx: *mut Context,
     let ctx = ffi_param_ref_mut!(ctx);
     ffi_make_fry_from_ctx!(ctx);
     let ks = ffi_param_ref_mut!(ks);
-    let id = ffi_param_ref!(id);
+    let id = id.ref_raw();
 
     ffi_try_box!(ks.get(&id))
 }
diff --git a/ffi/src/store.rs b/ffi/src/store.rs
index 7d7302d9..b0917196 100644
--- a/ffi/src/store.rs
+++ b/ffi/src/store.rs
@@ -31,7 +31,6 @@ extern crate sequoia_openpgp as openpgp;
 use self::openpgp::TPK;
 use self::openpgp::{
     Fingerprint,
-    KeyID
 };
 use sequoia_store::{
     self, Store, StoreIter, Binding, BindingIter, Key, KeyIter, LogIter, Pool,
@@ -40,6 +39,9 @@ use sequoia_store::{
 use super::error::Status;
 use super::core::Context;
 
+use ::openpgp::keyid::KeyID;
+use RefRaw;
+use Maybe;
 
 /// Lists all stores with the given prefix.
 #[::ffi_catch_abort] #[no_mangle]
@@ -256,7 +258,7 @@ pub extern "system" fn sq_store_lookup_by_keyid(ctx: *mut Context,
 {
     let ctx = ffi_param_ref_mut!(ctx);
     ffi_make_fry_from_ctx!(ctx);
-    let keyid = ffi_param_ref!(keyid);
+    let keyid = keyid.ref_raw();
 
     ffi_try_box!(Pool::lookup_by_keyid(&ctx.c, keyid))
 }
@@ -269,7 +271,7 @@ pub extern "system" fn sq_store_lookup_by_subkeyid(ctx: *mut Context,
 {
     let ctx = ffi_param_ref_mut!(ctx);
     ffi_make_fry_from_ctx!(ctx);
-    let keyid = ffi_param_ref!(keyid);
+    let keyid = keyid.ref_raw();
 
     ffi_try_box!(Pool::lookup_by_subkeyid(&ctx.c, keyid))
 }