summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md4
-rw-r--r--Cargo.toml2
-rw-r--r--README.md2
-rw-r--r--build.rs6
-rw-r--r--libnitrokey-v3.4.1/DeviceCommunicationExceptions.cpp (renamed from libnitrokey-v3.4/DeviceCommunicationExceptions.cpp)0
-rw-r--r--libnitrokey-v3.4.1/LICENSE (renamed from libnitrokey-v3.4/LICENSE)0
-rw-r--r--libnitrokey-v3.4.1/NK_C_API.cc (renamed from libnitrokey-v3.4/NK_C_API.cc)0
-rw-r--r--libnitrokey-v3.4.1/NK_C_API.h (renamed from libnitrokey-v3.4/NK_C_API.h)0
-rw-r--r--libnitrokey-v3.4.1/NitrokeyManager.cc (renamed from libnitrokey-v3.4/NitrokeyManager.cc)0
-rw-r--r--libnitrokey-v3.4.1/README.md (renamed from libnitrokey-v3.4/README.md)0
-rw-r--r--libnitrokey-v3.4.1/command_id.cc (renamed from libnitrokey-v3.4/command_id.cc)0
-rw-r--r--libnitrokey-v3.4.1/device.cc (renamed from libnitrokey-v3.4/device.cc)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/CommandFailedException.h (renamed from libnitrokey-v3.4/libnitrokey/CommandFailedException.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/DeviceCommunicationExceptions.h (renamed from libnitrokey-v3.4/libnitrokey/DeviceCommunicationExceptions.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/LibraryException.h (renamed from libnitrokey-v3.4/libnitrokey/LibraryException.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/LongOperationInProgressException.h (renamed from libnitrokey-v3.4/libnitrokey/LongOperationInProgressException.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/NitrokeyManager.h (renamed from libnitrokey-v3.4/libnitrokey/NitrokeyManager.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/command.h (renamed from libnitrokey-v3.4/libnitrokey/command.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/command_id.h (renamed from libnitrokey-v3.4/libnitrokey/command_id.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/cxx_semantics.h (renamed from libnitrokey-v3.4/libnitrokey/cxx_semantics.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/deprecated.h (renamed from libnitrokey-v3.4/libnitrokey/deprecated.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/device.h (renamed from libnitrokey-v3.4/libnitrokey/device.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/device_proto.h (renamed from libnitrokey-v3.4/libnitrokey/device_proto.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/dissect.h (renamed from libnitrokey-v3.4/libnitrokey/dissect.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/hidapi/hidapi.h (renamed from libnitrokey-v3.4/libnitrokey/hidapi/hidapi.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/log.h (renamed from libnitrokey-v3.4/libnitrokey/log.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/misc.h (renamed from libnitrokey-v3.4/libnitrokey/misc.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/stick10_commands.h (renamed from libnitrokey-v3.4/libnitrokey/stick10_commands.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/stick10_commands_0.8.h (renamed from libnitrokey-v3.4/libnitrokey/stick10_commands_0.8.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/stick20_commands.h (renamed from libnitrokey-v3.4/libnitrokey/stick20_commands.h)0
-rw-r--r--libnitrokey-v3.4.1/libnitrokey/version.h (renamed from libnitrokey-v3.4/libnitrokey/version.h)0
-rw-r--r--libnitrokey-v3.4.1/log.cc (renamed from libnitrokey-v3.4/log.cc)0
-rw-r--r--libnitrokey-v3.4.1/misc.cc (renamed from libnitrokey-v3.4/misc.cc)0
-rw-r--r--libnitrokey-v3.4.1/version.cc37
-rw-r--r--libnitrokey-v3.4.1/version.cc.in (renamed from libnitrokey-v3.4/version.cc.in)0
35 files changed, 48 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 113b342..00f832b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v3.4.1 (2018-12-10)
+
+- Update to libnitrokey 3.4.1. There are no changes affecting this crate.
+
# v3.4.0 (2018-12-10)
- Update to libnitrokey 3.4, causing all following changes.
diff --git a/Cargo.toml b/Cargo.toml
index d64bb52..2486b77 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "nitrokey-sys"
-version = "3.4.0"
+version = "3.4.1"
authors = ["Robin Krahl <robin.krahl@ireas.org>"]
homepage = "https://code.ireas.org/nitrokey-rs/"
repository = "https://git.ireas.org/nitrokey-sys-rs/"
diff --git a/README.md b/README.md
index b16d412..9b4f654 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ devices.
```toml
[dependencies]
-nitrokey-sys = "3.4.0"
+nitrokey-sys = "3.4.1"
```
The version of this crate corresponds to the wrapped `libnitrokey` version.
diff --git a/build.rs b/build.rs
index 162cbbd..a22bbd0 100644
--- a/build.rs
+++ b/build.rs
@@ -30,10 +30,14 @@ fn extract_git_version(pre: &str) -> Result<String, String> {
fn get_version() -> Result<Version, String> {
let major = env::var("CARGO_PKG_VERSION_MAJOR").map_err(stringify)?;
let minor = env::var("CARGO_PKG_VERSION_MINOR").map_err(stringify)?;
+ let patch = env::var("CARGO_PKG_VERSION_PATCH").map_err(stringify)?;
let pre = env::var("CARGO_PKG_VERSION_PRE").map_err(stringify)?;
let git = match pre.is_empty() {
- true => format!("v{}.{}", major, minor),
+ true => match patch.is_empty() {
+ true => format!("v{}.{}", major, minor),
+ false => format!("v{}.{}.{}", major, minor, patch),
+ },
false => extract_git_version(&pre)?,
};
diff --git a/libnitrokey-v3.4/DeviceCommunicationExceptions.cpp b/libnitrokey-v3.4.1/DeviceCommunicationExceptions.cpp
index 4d62aad..4d62aad 100644
--- a/libnitrokey-v3.4/DeviceCommunicationExceptions.cpp
+++ b/libnitrokey-v3.4.1/DeviceCommunicationExceptions.cpp
diff --git a/libnitrokey-v3.4/LICENSE b/libnitrokey-v3.4.1/LICENSE
index 341c30b..341c30b 100644
--- a/libnitrokey-v3.4/LICENSE
+++ b/libnitrokey-v3.4.1/LICENSE
diff --git a/libnitrokey-v3.4/NK_C_API.cc b/libnitrokey-v3.4.1/NK_C_API.cc
index 7d0a10e..7d0a10e 100644
--- a/libnitrokey-v3.4/NK_C_API.cc
+++ b/libnitrokey-v3.4.1/NK_C_API.cc
diff --git a/libnitrokey-v3.4/NK_C_API.h b/libnitrokey-v3.4.1/NK_C_API.h
index b1bdf1e..b1bdf1e 100644
--- a/libnitrokey-v3.4/NK_C_API.h
+++ b/libnitrokey-v3.4.1/NK_C_API.h
diff --git a/libnitrokey-v3.4/NitrokeyManager.cc b/libnitrokey-v3.4.1/NitrokeyManager.cc
index a950e4b..a950e4b 100644
--- a/libnitrokey-v3.4/NitrokeyManager.cc
+++ b/libnitrokey-v3.4.1/NitrokeyManager.cc
diff --git a/libnitrokey-v3.4/README.md b/libnitrokey-v3.4.1/README.md
index 81b367a..81b367a 100644
--- a/libnitrokey-v3.4/README.md
+++ b/libnitrokey-v3.4.1/README.md
diff --git a/libnitrokey-v3.4/command_id.cc b/libnitrokey-v3.4.1/command_id.cc
index a6c2a28..a6c2a28 100644
--- a/libnitrokey-v3.4/command_id.cc
+++ b/libnitrokey-v3.4.1/command_id.cc
diff --git a/libnitrokey-v3.4/device.cc b/libnitrokey-v3.4.1/device.cc
index 80e4b38..80e4b38 100644
--- a/libnitrokey-v3.4/device.cc
+++ b/libnitrokey-v3.4.1/device.cc
diff --git a/libnitrokey-v3.4/libnitrokey/CommandFailedException.h b/libnitrokey-v3.4.1/libnitrokey/CommandFailedException.h
index 32bd6b7..32bd6b7 100644
--- a/libnitrokey-v3.4/libnitrokey/CommandFailedException.h
+++ b/libnitrokey-v3.4.1/libnitrokey/CommandFailedException.h
diff --git a/libnitrokey-v3.4/libnitrokey/DeviceCommunicationExceptions.h b/libnitrokey-v3.4.1/libnitrokey/DeviceCommunicationExceptions.h
index f710d0b..f710d0b 100644
--- a/libnitrokey-v3.4/libnitrokey/DeviceCommunicationExceptions.h
+++ b/libnitrokey-v3.4.1/libnitrokey/DeviceCommunicationExceptions.h
diff --git a/libnitrokey-v3.4/libnitrokey/LibraryException.h b/libnitrokey-v3.4.1/libnitrokey/LibraryException.h
index 3b9d177..3b9d177 100644
--- a/libnitrokey-v3.4/libnitrokey/LibraryException.h
+++ b/libnitrokey-v3.4.1/libnitrokey/LibraryException.h
diff --git a/libnitrokey-v3.4/libnitrokey/LongOperationInProgressException.h b/libnitrokey-v3.4.1/libnitrokey/LongOperationInProgressException.h
index 865d6b5..865d6b5 100644
--- a/libnitrokey-v3.4/libnitrokey/LongOperationInProgressException.h
+++ b/libnitrokey-v3.4.1/libnitrokey/LongOperationInProgressException.h
diff --git a/libnitrokey-v3.4/libnitrokey/NitrokeyManager.h b/libnitrokey-v3.4.1/libnitrokey/NitrokeyManager.h
index d6e5df4..d6e5df4 100644
--- a/libnitrokey-v3.4/libnitrokey/NitrokeyManager.h
+++ b/libnitrokey-v3.4.1/libnitrokey/NitrokeyManager.h
diff --git a/libnitrokey-v3.4/libnitrokey/command.h b/libnitrokey-v3.4.1/libnitrokey/command.h
index 6852bf0..6852bf0 100644
--- a/libnitrokey-v3.4/libnitrokey/command.h
+++ b/libnitrokey-v3.4.1/libnitrokey/command.h
diff --git a/libnitrokey-v3.4/libnitrokey/command_id.h b/libnitrokey-v3.4.1/libnitrokey/command_id.h
index eb0d450..eb0d450 100644
--- a/libnitrokey-v3.4/libnitrokey/command_id.h
+++ b/libnitrokey-v3.4.1/libnitrokey/command_id.h
diff --git a/libnitrokey-v3.4/libnitrokey/cxx_semantics.h b/libnitrokey-v3.4.1/libnitrokey/cxx_semantics.h
index 36ed142..36ed142 100644
--- a/libnitrokey-v3.4/libnitrokey/cxx_semantics.h
+++ b/libnitrokey-v3.4.1/libnitrokey/cxx_semantics.h
diff --git a/libnitrokey-v3.4/libnitrokey/deprecated.h b/libnitrokey-v3.4.1/libnitrokey/deprecated.h
index 5a83288..5a83288 100644
--- a/libnitrokey-v3.4/libnitrokey/deprecated.h
+++ b/libnitrokey-v3.4.1/libnitrokey/deprecated.h
diff --git a/libnitrokey-v3.4/libnitrokey/device.h b/libnitrokey-v3.4.1/libnitrokey/device.h
index f6d2380..f6d2380 100644
--- a/libnitrokey-v3.4/libnitrokey/device.h
+++ b/libnitrokey-v3.4.1/libnitrokey/device.h
diff --git a/libnitrokey-v3.4/libnitrokey/device_proto.h b/libnitrokey-v3.4.1/libnitrokey/device_proto.h
index 45a6c16..45a6c16 100644
--- a/libnitrokey-v3.4/libnitrokey/device_proto.h
+++ b/libnitrokey-v3.4.1/libnitrokey/device_proto.h
diff --git a/libnitrokey-v3.4/libnitrokey/dissect.h b/libnitrokey-v3.4.1/libnitrokey/dissect.h
index 690b5b7..690b5b7 100644
--- a/libnitrokey-v3.4/libnitrokey/dissect.h
+++ b/libnitrokey-v3.4.1/libnitrokey/dissect.h
diff --git a/libnitrokey-v3.4/libnitrokey/hidapi/hidapi.h b/libnitrokey-v3.4.1/libnitrokey/hidapi/hidapi.h
index e5bc2dc..e5bc2dc 100644
--- a/libnitrokey-v3.4/libnitrokey/hidapi/hidapi.h
+++ b/libnitrokey-v3.4.1/libnitrokey/hidapi/hidapi.h
diff --git a/libnitrokey-v3.4/libnitrokey/log.h b/libnitrokey-v3.4.1/libnitrokey/log.h
index 2a64bef..2a64bef 100644
--- a/libnitrokey-v3.4/libnitrokey/log.h
+++ b/libnitrokey-v3.4.1/libnitrokey/log.h
diff --git a/libnitrokey-v3.4/libnitrokey/misc.h b/libnitrokey-v3.4.1/libnitrokey/misc.h
index 88254dd..88254dd 100644
--- a/libnitrokey-v3.4/libnitrokey/misc.h
+++ b/libnitrokey-v3.4.1/libnitrokey/misc.h
diff --git a/libnitrokey-v3.4/libnitrokey/stick10_commands.h b/libnitrokey-v3.4.1/libnitrokey/stick10_commands.h
index f2ffba2..f2ffba2 100644
--- a/libnitrokey-v3.4/libnitrokey/stick10_commands.h
+++ b/libnitrokey-v3.4.1/libnitrokey/stick10_commands.h
diff --git a/libnitrokey-v3.4/libnitrokey/stick10_commands_0.8.h b/libnitrokey-v3.4.1/libnitrokey/stick10_commands_0.8.h
index 9477890..9477890 100644
--- a/libnitrokey-v3.4/libnitrokey/stick10_commands_0.8.h
+++ b/libnitrokey-v3.4.1/libnitrokey/stick10_commands_0.8.h
diff --git a/libnitrokey-v3.4/libnitrokey/stick20_commands.h b/libnitrokey-v3.4.1/libnitrokey/stick20_commands.h
index 7efa1b6..7efa1b6 100644
--- a/libnitrokey-v3.4/libnitrokey/stick20_commands.h
+++ b/libnitrokey-v3.4.1/libnitrokey/stick20_commands.h
diff --git a/libnitrokey-v3.4/libnitrokey/version.h b/libnitrokey-v3.4.1/libnitrokey/version.h
index 6547af0..6547af0 100644
--- a/libnitrokey-v3.4/libnitrokey/version.h
+++ b/libnitrokey-v3.4.1/libnitrokey/version.h
diff --git a/libnitrokey-v3.4/log.cc b/libnitrokey-v3.4.1/log.cc
index 06acee7..06acee7 100644
--- a/libnitrokey-v3.4/log.cc
+++ b/libnitrokey-v3.4.1/log.cc
diff --git a/libnitrokey-v3.4/misc.cc b/libnitrokey-v3.4.1/misc.cc
index 59185f3..59185f3 100644
--- a/libnitrokey-v3.4/misc.cc
+++ b/libnitrokey-v3.4.1/misc.cc
diff --git a/libnitrokey-v3.4.1/version.cc b/libnitrokey-v3.4.1/version.cc
new file mode 100644
index 0000000..dfdc802
--- /dev/null
+++ b/libnitrokey-v3.4.1/version.cc
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2018 Nitrokey UG
+ *
+ * This file is part of libnitrokey.
+ *
+ * libnitrokey is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * libnitrokey is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libnitrokey. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: LGPL-3.0
+ */
+
+#include "version.h"
+
+namespace nitrokey {
+ unsigned int get_major_library_version() {
+ return 3;
+ }
+
+ unsigned int get_minor_library_version() {
+ return 0;
+ }
+
+ const char* get_library_version() {
+ return "unknown";
+ }
+}
+
diff --git a/libnitrokey-v3.4/version.cc.in b/libnitrokey-v3.4.1/version.cc.in
index 0eae647..0eae647 100644
--- a/libnitrokey-v3.4/version.cc.in
+++ b/libnitrokey-v3.4.1/version.cc.in