From 0e349c565e871fe49cd9b94799af82566f13e79c Mon Sep 17 00:00:00 2001 From: alex-nitrokey Date: Tue, 9 Jun 2020 18:42:55 +0200 Subject: [PATCH] Update hotp-verification --- modules/libremkey-hotp-verification | 4 +- ...36a7a1950226d0ef94e2eeed0ffb510eba89.patch | 73 ------------------- 2 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 patches/libremkey-hotp-verification-e5fa36a7a1950226d0ef94e2eeed0ffb510eba89.patch diff --git a/modules/libremkey-hotp-verification b/modules/libremkey-hotp-verification index 5ebb713b..c01c07cd 100644 --- a/modules/libremkey-hotp-verification +++ b/modules/libremkey-hotp-verification @@ -2,11 +2,11 @@ modules-$(CONFIG_LIBREMKEY) += libremkey-hotp-verification libremkey-hotp-verification_depends := libusb $(musl_dep) -libremkey-hotp-verification_version := 809953b9b4bef97a4cffaa20d675bd7fe9d8da53 +libremkey-hotp-verification_version := 1cf1e1f3601b79692b81d409597136b8ff7c723a libremkey-hotp-verification_dir := libremkey-hotp-verification-$(libremkey-hotp-verification_version) libremkey-hotp-verification_tar := nitrokey-hotp-verification-$(libremkey-hotp-verification_version).tar.gz libremkey-hotp-verification_url := https://github.com/Nitrokey/nitrokey-hotp-verification/archive/$(libremkey-hotp-verification_version).tar.gz -libremkey-hotp-verification_hash := 251e5cef74e4e45eeddc49e4a1da1e22d1de774cd32cb0451a9030579ae958ba +libremkey-hotp-verification_hash := 21152cfb272f8edeff1220065940d5d6dfc12dbb2a48b84e64b24f8fc89c2567 libremkey-hotp-verification_target := \ $(MAKE_JOBS) \ diff --git a/patches/libremkey-hotp-verification-e5fa36a7a1950226d0ef94e2eeed0ffb510eba89.patch b/patches/libremkey-hotp-verification-e5fa36a7a1950226d0ef94e2eeed0ffb510eba89.patch deleted file mode 100644 index 5f058f22..00000000 --- a/patches/libremkey-hotp-verification-e5fa36a7a1950226d0ef94e2eeed0ffb510eba89.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- nitrokey-hotp-verification-a/Toolchain-heads.cmake 2018-05-22 09:55:46.907209235 -0700 -+++ nitrokey-hotp-verification-b/Toolchain-heads.cmake 2018-05-22 09:55:26.659371966 -0700 -@@ -0,0 +1,27 @@ -+SET(CMAKE_SYSTEM_NAME Linux) -+SET(CMAKE_SYSTEM_VERSION 1) -+ -+# Specify the cross compiler -+SET(CMAKE_C_COMPILER $ENV{CROSS}gcc) -+SET(CMAKE_CXX_COMPILER $ENV{CROSS}gcc) -+ -+#sysroot location -+set(MYSYSROOT $ENV{INSTALL}) -+ -+# compiler/linker flags -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot=${MYSYSROOT}" CACHE INTERNAL "" FORCE) -+set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} --sysroot=${MYSYSROOT}" CACHE INTERNAL "" FORCE) -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --sysroot=${MYSYSROOT}" CACHE INTERNAL "" FORCE) -+set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} --sysroot=${MYSYSROOT}" CACHE INTERNAL "" FORCE) -+ -+# Where is the target environment -+SET(CMAKE_FIND_ROOT_PATH "${MYSYSROOT}") -+ -+# Search for programs only in the build host directories -+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -+ -+# Search for libraries and headers only in the target directories -+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -+ -+INCLUDE_DIRECTORIES(hidapi) ---- libremkey-hotp-verification/device.c 2018-06-20 16:13:36.417804210 -0700 -+++ libremkey-hotp-verification-b/device.c 2018-06-20 16:14:34.532367723 -0700 -@@ -34,7 +34,7 @@ - const unsigned short m_vid = 0x20a0; - const unsigned short m_pid = 0x4108; - --static const int CONNECTION_ATTEMPTS_COUNT = 80; -+static const int CONNECTION_ATTEMPTS_COUNT = 2; - - static const int CONNECTION_ATTEMPT_DELAY_MICRO_SECONDS = 1000*1000/2; - ---- libremkey-hotp-verification/libremkey_hotp_initialize -+++ libremkey-hotp-verification-b/libremkey_hotp_initialize -@@ -14,9 +14,9 @@ fi - PIN=$1 - SECRET=$2 - COUNTER=$3 --SECRET_B32=$(echo -n $SECRET | base32) -+SECRET_B32=$(cat $SECRET | base32) - --libremkey_hotp_verification set $SECRET_B32 $PIN -+libremkey_hotp_verification set $SECRET_B32 "$PIN" - if [ $? -ne 0 ]; then - echo "ERROR: Setting HOTP secret on Librem Key failed!" - exit 1 -@@ -25,7 +25,7 @@ fi - i=9 - while [ "$i" -lt "$COUNTER" ]; do - echo "Updating counter to $i" -- HOTP_CODE=$(echo $SECRET | hotp $i) -+ HOTP_CODE=$(hotp $i < $SECRET) - libremkey_hotp_verification check $HOTP_CODE > /dev/null - if [ $? -ne 0 ]; then - echo "HOTP check failed for counter=$i, code=$HOTP_CODE" -@@ -34,7 +34,7 @@ while [ "$i" -lt "$COUNTER" ]; do - let "i += 10" - done - --HOTP_CODE=$(echo $SECRET | hotp $COUNTER) -+HOTP_CODE=$(hotp $COUNTER < $SECRET) - libremkey_hotp_verification check $HOTP_CODE > /dev/null - if [ $? -ne 0 ]; then - echo "HOTP check failed for counter=$COUNTER, code=$HOTP_CODE"