From 87743ec8ad0ff7d76302dff57354ac6158b1bc53 Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Sat, 14 May 2016 20:16:23 +0600 Subject: [PATCH] SecurityToken: fix reset&wipe token method --- .../keychain/securitytoken/SecurityTokenHelper.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java index dae273b91..24e841bcf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java @@ -666,13 +666,11 @@ public class SecurityTokenHelper { * Afterwards, the token is reactivated. */ public void resetAndWipeToken() throws IOException { - String accepted = "9000"; - // try wrong PIN 4 times until counter goes to C0 byte[] pin = "XXXXXX".getBytes(); for (int i = 0; i <= 4; i++) { ResponseAPDU response = tryPin(0x81, pin); - if (response.getSW() != APDU_SW_SUCCESS) { // Should NOT accept! + if (response.getSW() == APDU_SW_SUCCESS) { // Should NOT accept! throw new CardException("Should never happen, XXXXXX has been accepted!", response.getSW()); } } @@ -681,7 +679,7 @@ public class SecurityTokenHelper { byte[] adminPin = "XXXXXXXX".getBytes(); for (int i = 0; i <= 4; i++) { ResponseAPDU response = tryPin(0x83, adminPin); - if (response.getSW() != APDU_SW_SUCCESS) { // Should NOT accept! + if (response.getSW() == APDU_SW_SUCCESS) { // Should NOT accept! throw new CardException("Should never happen, XXXXXXXX has been accepted", response.getSW()); } }