diff options
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | nitrokey-sys/Cargo.toml | 17 | ||||
| -rw-r--r-- | nitrokey-sys/build.rs | 17 | ||||
| -rw-r--r-- | nitrokey-sys/src/lib.rs | 29 | ||||
| -rw-r--r-- | nitrokey-sys/wrapper.h | 2 |
5 files changed, 1 insertions, 66 deletions
@@ -17,5 +17,5 @@ test-pro = [] [dependencies] libc = "0.2" -nitrokey-sys = { path = "nitrokey-sys", version = "0.1.0" } +nitrokey-sys = "0.1.0" rand = "0.4" diff --git a/nitrokey-sys/Cargo.toml b/nitrokey-sys/Cargo.toml deleted file mode 100644 index 3ce5d21..0000000 --- a/nitrokey-sys/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "nitrokey-sys" -version = "0.1.0" -authors = ["Robin Krahl <robin.krahl@ireas.org>"] -homepage = "https://code.ireas.org/nitrokey-rs/" -repository = "https://git.ireas.org/nitrokey-rs/" -description = "Bindings to libnitrokey for communication with Nitrokey devices" -categories = ["external-ffi-bindings"] -license = "MIT" -links = "nitrokey" -build = "build.rs" - -[dependencies] -libc = "0.2" - -[build-dependencies] -bindgen = "0.26.3" diff --git a/nitrokey-sys/build.rs b/nitrokey-sys/build.rs deleted file mode 100644 index 7b3325c..0000000 --- a/nitrokey-sys/build.rs +++ /dev/null @@ -1,17 +0,0 @@ -extern crate bindgen; - -use std::env; -use std::path::PathBuf; - -fn main() { - println!("cargo:rustc-link-lib=nitrokey"); - - let bindings = bindgen::Builder::default() - .header("wrapper.h") - .generate() - .expect("Unable to generate bindings"); - let out_path = PathBuf::from(env::var("OUT_DIR").unwrap()); - bindings - .write_to_file(out_path.join("bindings.rs")) - .expect("Could not write bindings"); -} diff --git a/nitrokey-sys/src/lib.rs b/nitrokey-sys/src/lib.rs deleted file mode 100644 index 0641e13..0000000 --- a/nitrokey-sys/src/lib.rs +++ /dev/null @@ -1,29 +0,0 @@ -#![allow(non_upper_case_globals)] -#![allow(non_camel_case_types)] -#![allow(non_snake_case)] - -include!(concat!(env!("OUT_DIR"), "/bindings.rs")); - -#[cfg(test)] -mod tests { - use super::*; - use std::ffi::CString; - - #[test] - fn login_auto() { - unsafe { - assert_eq!(0, NK_login_auto()); - } - } - - #[test] - fn login() { - unsafe { - // Unconnected - assert_eq!(0, NK_login(CString::new("S").unwrap().as_ptr())); - assert_eq!(0, NK_login(CString::new("P").unwrap().as_ptr())); - // Unsupported model - assert_eq!(0, NK_login(CString::new("T").unwrap().as_ptr())); - } - } -} diff --git a/nitrokey-sys/wrapper.h b/nitrokey-sys/wrapper.h deleted file mode 100644 index 3c8d7cf..0000000 --- a/nitrokey-sys/wrapper.h +++ /dev/null @@ -1,2 +0,0 @@ -#include <stdbool.h> -#include <libnitrokey/NK_C_API.h> |