From 8b2d8818b26e7084cad240c48fd9ce7fc2519012 Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
Date: Tue, 22 Jan 2019 20:13:42 -0800
Subject: Update nitrokey crate to 0.3.4

This change updates the nitrokey crate to version 0.3.4.

Import subrepo nitrokey/:nitrokey at 41cdc1f7091a3c442241dbb2379c50dbcc7e9c5f
---
 nitrokey/CHANGELOG.md |  3 +++
 nitrokey/Cargo.toml   |  2 +-
 nitrokey/src/auth.rs  | 19 ++++++++++---------
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'nitrokey')

diff --git a/nitrokey/CHANGELOG.md b/nitrokey/CHANGELOG.md
index 3845aaf..edc33f6 100644
--- a/nitrokey/CHANGELOG.md
+++ b/nitrokey/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v0.3.4 (2019-01-20)
+- Fix authentication methods that assumed that `char` is signed.
+
 # v0.3.3 (2019-01-16)
 - Add the `get_production_info` and `clear_new_sd_card_warning` methods to the
   `Storage` struct.
diff --git a/nitrokey/Cargo.toml b/nitrokey/Cargo.toml
index 802d022..838ab45 100644
--- a/nitrokey/Cargo.toml
+++ b/nitrokey/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nitrokey"
-version = "0.3.3"
+version = "0.3.4"
 authors = ["Robin Krahl <robin.krahl@ireas.org>"]
 edition = "2018"
 homepage = "https://code.ireas.org/nitrokey-rs/"
diff --git a/nitrokey/src/auth.rs b/nitrokey/src/auth.rs
index 3280924..2d61d4b 100644
--- a/nitrokey/src/auth.rs
+++ b/nitrokey/src/auth.rs
@@ -1,4 +1,5 @@
 use std::ops::Deref;
+use std::os::raw::c_char;
 use std::os::raw::c_int;
 
 use nitrokey_sys;
@@ -147,7 +148,7 @@ fn authenticate<D, A, T>(device: D, password: &str, callback: T) -> Result<A, (D
 where
     D: Device,
     A: AuthenticatedDevice<D>,
-    T: Fn(*const i8, *const i8) -> c_int,
+    T: Fn(*const c_char, *const c_char) -> c_int,
 {
     let temp_password = match generate_password(TEMPORARY_PASSWORD_LENGTH) {
         Ok(temp_password) => temp_password,
@@ -158,7 +159,7 @@ where
         Err(err) => return Err((device, err)),
     };
     let password_ptr = password.as_ptr();
-    let temp_password_ptr = temp_password.as_ptr() as *const i8;
+    let temp_password_ptr = temp_password.as_ptr() as *const c_char;
     return match callback(password_ptr, temp_password_ptr) {
         0 => Ok(A::new(device, temp_password)),
         rv => Err((device, CommandError::from(rv))),
@@ -217,14 +218,14 @@ impl<T: Device> Deref for User<T> {
 impl<T: Device> GenerateOtp for User<T> {
     fn get_hotp_code(&self, slot: u8) -> Result<String, CommandError> {
         unsafe {
-            let temp_password_ptr = self.temp_password.as_ptr() as *const i8;
+            let temp_password_ptr = self.temp_password.as_ptr() as *const c_char;
             return result_from_string(nitrokey_sys::NK_get_hotp_code_PIN(slot, temp_password_ptr));
         }
     }
 
     fn get_totp_code(&self, slot: u8) -> Result<String, CommandError> {
         unsafe {
-            let temp_password_ptr = self.temp_password.as_ptr() as *const i8;
+            let temp_password_ptr = self.temp_password.as_ptr() as *const c_char;
             return result_from_string(nitrokey_sys::NK_get_totp_code_PIN(
                 slot,
                 0,
@@ -297,17 +298,17 @@ impl<T: Device> Admin<T> {
                 raw_config.scrollock,
                 raw_config.user_password,
                 false,
-                self.temp_password.as_ptr() as *const i8,
+                self.temp_password.as_ptr() as *const c_char,
             ))
         }
     }
 
     fn write_otp_slot<C>(&self, data: OtpSlotData, callback: C) -> Result<(), CommandError>
     where
-        C: Fn(RawOtpSlotData, *const i8) -> c_int,
+        C: Fn(RawOtpSlotData, *const c_char) -> c_int,
     {
         let raw_data = RawOtpSlotData::new(data)?;
-        let temp_password_ptr = self.temp_password.as_ptr() as *const i8;
+        let temp_password_ptr = self.temp_password.as_ptr() as *const c_char;
         get_command_result(callback(raw_data, temp_password_ptr))
     }
 }
@@ -346,12 +347,12 @@ impl<T: Device> ConfigureOtp for Admin<T> {
     }
 
     fn erase_hotp_slot(&self, slot: u8) -> Result<(), CommandError> {
-        let temp_password_ptr = self.temp_password.as_ptr() as *const i8;
+        let temp_password_ptr = self.temp_password.as_ptr() as *const c_char;
         unsafe { get_command_result(nitrokey_sys::NK_erase_hotp_slot(slot, temp_password_ptr)) }
     }
 
     fn erase_totp_slot(&self, slot: u8) -> Result<(), CommandError> {
-        let temp_password_ptr = self.temp_password.as_ptr() as *const i8;
+        let temp_password_ptr = self.temp_password.as_ptr() as *const c_char;
         unsafe { get_command_result(nitrokey_sys::NK_erase_totp_slot(slot, temp_password_ptr)) }
     }
 }
-- 
cgit v1.2.3