upd. libnk module to 3.6; remove 3.5 patch

.circleci/config.yml

@@ -151,39 +151,40 @@ jobs:
           path: build/x230-hotp-verification
 
       - run:
-          name: librem_mini-NoTPM
+          name: x230-nkstorecli
           command: |
-            rm -rf build/librem_mini-NoTPM/* build/log/* && make --load 2 \
+            rm -rf build/x230-nkstorecli/* build/log/* && make --load 2 \
                 V=1 \
-                BOARD=librem_mini-NoTPM || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
+                BOARD=x230-nkstorecli || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
           no_output_timeout: 3h
       - run:
-          name: Ouput librem_mini-NoTPM hashes
+          name: Ouput x230-nkstorecli hashes
           command: |
-            cat build/librem_mini-NoTPM/hashes.txt \
+            cat build/x230-nkstorecli/hashes.txt \
       - run:
-          name: Archiving build logs for librem_mini-NoTPM
+          name: Archiving build logs for x230-nkstorecli
           command: |
-             tar zcvf build/librem_mini-NoTPM/logs.tar.gz build/log/*
+             tar zcvf build/x230-nkstorecli/logs.tar.gz build/log/*
       - store-artifacts:
-          path: build/librem_mini-NoTPM
+          path: build/x230-nkstorecli
+
       - run:
-          name: x230-nkstorecli
+          name: librem_mini-NoTPM
           command: |
-            rm -rf build/x230-nkstorecli/* build/log/* && make --load 2 \
+            rm -rf build/librem_mini-NoTPM/* build/log/* && make --load 2 \
                 V=1 \
-                BOARD=x230-nkstorecli \
+                BOARD=librem_mini-NoTPM || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
           no_output_timeout: 3h
       - run:
-          name: Ouput x230-nkstorecli hashes
+          name: Ouput librem_mini-NoTPM hashes
           command: |
-            cat build/x230-nkstorecli/hashes.txt \
+            cat build/librem_mini-NoTPM/hashes.txt \
       - run:
-          name: Archiving build logs for x230-nkstorecli
+          name: Archiving build logs for librem_mini-NoTPM
           command: |
-             tar zcvf build/x230-nkstorecli/logs.tar.gz build/log/*
+             tar zcvf build/librem_mini-NoTPM/logs.tar.gz build/log/*
       - store-artifacts:
-          path: build/x230-nkstorecli
+          path: build/librem_mini-NoTPM
 
       - run:
           name: qemu-coreboot

modules/libnitrokey

@@ -2,11 +2,11 @@ modules-$(CONFIG_NKSTORECLI) += libnitrokey
 
 libnitrokey_depends := libhidapi-libusb libusb $(musl_dep)
 
-libnitrokey_version := 3.5
+libnitrokey_version := 3.6
 libnitrokey_dir := libnitrokey-$(libnitrokey_version)
 libnitrokey_tar := libnitrokey-v$(libnitrokey_version).tar.gz
 libnitrokey_url := https://github.com/Nitrokey/libnitrokey/releases/download/v$(libnitrokey_version)/$(libnitrokey_tar)
-libnitrokey_hash := f829280402f29f55237736b060fd41955a701c3828ee1270846b4e57efcf83cf
+libnitrokey_hash := 4f3382b6193afe69c2001321038fce9490bc28803ed687152a397ccd89146ae6
 
 # currently the dynamic lib is not included
 #libnitrokey_libraries := \