Merge pull request #1868 from nmikhailov/nitrokey

WIP: Security token USB handling improvements

OpenKeychain/src/main/res/xml/usb_device_filter.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-    Based on https://github.com/Yubico/yubikey-personalization/blob/master/ykcore/ykdef.h
+    Based on
+    https://github.com/Yubico/yubikey-personalization/blob/master/ykcore/ykdef.h
+    https://www.nitrokey.com/de/documentation/installation#p:nitrokey-pro&os:linux
+
     Note that values are decimal.
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
@@ -24,4 +27,16 @@
     <!-- Yubikey 4 OTP + U2F + CCID-->
     <usb-device class="11" vendor-id="4176" product-id="1031"/>
 
+
+    <!-- Nitrokey Pro-->
+    <usb-device class="11" vendor-id="8352" product-id="16648"/>
+    <!-- Nitrokey Storage-->
+    <usb-device class="11" vendor-id="8352" product-id="16649"/>
+
+    <!--GNUK based device are not supported right now-->
+    
+    <!-- Nitrokey Start-->
+    <!--<usb-device class="11" vendor-id="8352" product-id="16913"/>-->
+    <!-- Default GNUK vid/pid-->
+    <!--<usb-device class="11" vendor-id="9035" product-id="0"/>-->
 </resources>