From 56eb89dcf5f7d2c3b4ea92490a3b4df6f85713c0 Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Sat, 19 Sep 2020 23:05:35 +0200
Subject: Update to libnitrokey v3.6

This patch updates libnitrokey from version 3.5 to version 3.6, causing
these changes:

- New constants:
  - `NK_device_model_NK_LIBREM` (`NK_device_model` enum)
- New structures:
  - `NK_config`
- New functions:
  - `NK_device_serial_number_as_u32`
  - `NK_write_config_struct`
  - `NK_free_config`
  - `NK_read_config_struct`
  - `NK_free_password_safe_slot_status`
- Deprecated functions:
  - `NK_set_unencrypted_read_only`
  - `NK_set_unencrypted_read_write`
---
 patches/deprecated.diff | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'patches')

diff --git a/patches/deprecated.diff b/patches/deprecated.diff
index c814812..79fe5ba 100644
--- a/patches/deprecated.diff
+++ b/patches/deprecated.diff
@@ -6,7 +6,7 @@ Index: nitrokey-sys-rs/src/ffi.rs
 ===================================================================
 --- nitrokey-sys-rs.orig/src/ffi.rs
 +++ nitrokey-sys-rs/src/ffi.rs
-@@ -767,6 +767,7 @@ extern "C" {
+@@ -848,6 +848,7 @@ extern "C" {
      #[doc = " deprecated in favor of NK_get_status_as_string."]
      #[doc = " @return string representation of the status or an empty string"]
      #[doc = "         if the command failed"]
@@ -14,7 +14,7 @@ Index: nitrokey-sys-rs/src/ffi.rs
      pub fn NK_status() -> *mut ::std::os::raw::c_char;
  }
  extern "C" {
-@@ -1022,6 +1023,7 @@ extern "C" {
+@@ -1134,6 +1135,7 @@ extern "C" {
      pub fn NK_totp_set_time_soft(time: u64) -> ::std::os::raw::c_int;
  }
  extern "C" {
@@ -22,3 +22,19 @@ Index: nitrokey-sys-rs/src/ffi.rs
      pub fn NK_totp_get_time() -> ::std::os::raw::c_int;
  }
  extern "C" {
+@@ -1309,6 +1311,7 @@ extern "C" {
+     #[doc = " Storage only"]
+     #[doc = " @param user_pin 20 characters User PIN"]
+     #[doc = " @return command processing error code"]
++    #[deprecated(since = "3.6.0", note = "use `set_unencrypted_read_only_admin` instead")]
+     pub fn NK_set_unencrypted_read_only(
+         user_pin: *const ::std::os::raw::c_char,
+     ) -> ::std::os::raw::c_int;
+@@ -1322,6 +1325,7 @@ extern "C" {
+     #[doc = " Storage only"]
+     #[doc = " @param user_pin 20 characters User PIN"]
+     #[doc = " @return command processing error code"]
++    #[deprecated(since = "3.6.0", note = "use `set_unencrypted_read_write_admin` instead")]
+     pub fn NK_set_unencrypted_read_write(
+         user_pin: *const ::std::os::raw::c_char,
+     ) -> ::std::os::raw::c_int;
-- 
cgit v1.2.3