From a42391f7e9df6c9c9fb1befb3f028097a6f88e04 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 31 Oct 2017 16:06:58 +0100 Subject: [PATCH] add Nitrokey Pro to whitelist for reset and key import after testing --- .../keychain/securitytoken/SecurityTokenInfo.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java index 9fa9f58ba..4e5137da2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java @@ -110,12 +110,14 @@ public abstract class SecurityTokenInfo implements Parcelable { private static final HashSet SUPPORTED_USB_RESET = new HashSet<>(Arrays.asList( TokenType.YUBIKEY_NEO, TokenType.YUBIKEY_4, + TokenType.NITROKEY_PRO, TokenType.GNUK_NEWER_1_25 )); private static final HashSet SUPPORTED_USB_PUT_KEY = new HashSet<>(Arrays.asList( TokenType.YUBIKEY_NEO, - TokenType.YUBIKEY_4 // Not clear, will be tested: https://github.com/open-keychain/open-keychain/issues/2069 + TokenType.YUBIKEY_4, // Not clear, will be tested: https://github.com/open-keychain/open-keychain/issues/2069 + TokenType.NITROKEY_PRO )); public boolean isSecurityTokenSupported() {