cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SecurityToken: fix reset&wipe token method

Browse Source
This commit is contained in:
Nikita Mikhailov
2016-05-14 20:16:23 +06:00
parent b71f9f4fd7
commit 87743ec8ad
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
View File

@@ -666,13 +666,11 @@ public class SecurityTokenHelper {
* Afterwards, the token is reactivated. * Afterwards, the token is reactivated.
*/ */
public void resetAndWipeToken() throws IOException { public void resetAndWipeToken() throws IOException {
String accepted = "9000";
// try wrong PIN 4 times until counter goes to C0 // try wrong PIN 4 times until counter goes to C0
byte[] pin = "XXXXXX".getBytes(); byte[] pin = "XXXXXX".getBytes();
for (int i = 0; i <= 4; i++) { for (int i = 0; i <= 4; i++) {
ResponseAPDU response = tryPin(0x81, pin); 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()); throw new CardException("Should never happen, XXXXXX has been accepted!", response.getSW());
} }
} }
@@ -681,7 +679,7 @@ public class SecurityTokenHelper {
byte[] adminPin = "XXXXXXXX".getBytes(); byte[] adminPin = "XXXXXXXX".getBytes();
for (int i = 0; i <= 4; i++) { for (int i = 0; i <= 4; i++) {
ResponseAPDU response = tryPin(0x83, adminPin); 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()); throw new CardException("Should never happen, XXXXXXXX has been accepted", response.getSW());
} }
} }