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

Split up ResetAndWipeTokenOp a bit, and add test

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-01-13 16:28:26 +01:00
parent 0d2cbd0654
commit 442845f1fe
4 changed files with 119 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCapabilities.java
View File

@@ -102,6 +102,14 @@ public abstract class OpenPgpCapabilities {
return getPwStatusBytes()[MAX_PW3_LENGTH_INDEX];
}
public int getPw1TriesLeft() {
return getPwStatusBytes()[4];
}
public int getPw3TriesLeft() {
return getPwStatusBytes()[6];
}
@AutoValue.Builder
@SuppressWarnings("UnusedReturnValue")
abstract static class Builder {

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
View File

@@ -386,13 +386,14 @@ public class SecurityTokenConnection {
byte[] aid = openPgpCapabilities.getAid();
String userId = parseHolderName(readUserId());
String url = readUrl();
byte[] pwInfo = openPgpCapabilities.getPwStatusBytes();
int pw1TriesLeft = openPgpCapabilities.getPw1TriesLeft();
int pw3TriesLeft = openPgpCapabilities.getPw3TriesLeft();
boolean hasLifeCycleManagement = cardCapabilities.hasLifeCycleManagement();
TransportType transportType = transport.getTransportType();
return SecurityTokenInfo.create(transportType, tokenType, fingerprints, aid, userId, url, pwInfo[4], pwInfo[6],
hasLifeCycleManagement);
return SecurityTokenInfo.create(transportType, tokenType, fingerprints, aid, userId, url, pw1TriesLeft,
pw3TriesLeft, hasLifeCycleManagement);
}

58
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/operations/ResetAndWipeTokenOp.java
View File

@@ -10,6 +10,8 @@ import org.sufficientlysecure.keychain.securitytoken.SecurityTokenConnection;
public class ResetAndWipeTokenOp {
private static final byte[] INVALID_PIN = "XXXXXXXXXXX".getBytes();
private final SecurityTokenConnection connection;
public static ResetAndWipeTokenOp create(SecurityTokenConnection connection) {
@@ -26,41 +28,16 @@ public class ResetAndWipeTokenOp {
* Afterwards, the token is reactivated.
*/
public void resetAndWipeToken() throws IOException {
// try wrong PIN 4 times until counter goes to C0
byte[] pin = "XXXXXX".getBytes();
CommandApdu verifyPw1ForSignatureCommand =
connection.getCommandFactory().createVerifyPw1ForSignatureCommand(pin);
for (int i = 0; i <= 4; i++) {
// Command APDU for VERIFY command (page 32)
ResponseApdu response = connection.communicate(verifyPw1ForSignatureCommand);
if (response.isSuccess()) {
throw new CardException("Should never happen, XXXXXX has been accepted!", response.getSw());
}
}
// try wrong Admin PIN 4 times until counter goes to C0
byte[] adminPin = "XXXXXXXX".getBytes();
CommandApdu verifyPw3Command = connection.getCommandFactory().createVerifyPw3Command(adminPin);
for (int i = 0; i <= 4; i++) {
// Command APDU for VERIFY command (page 32)
ResponseApdu response = connection.communicate(
verifyPw3Command);
if (response.isSuccess()) { // Should NOT accept!
throw new CardException("Should never happen, XXXXXXXX has been accepted", response.getSw());
}
}
exhausePw1Tries();
exhaustPw3Tries();
// secure messaging must be disabled before reactivation
connection.clearSecureMessaging();
// reactivate token!
// NOTE: keep the order here! First execute _both_ reactivate commands. Before checking _both_ responses
// If a token is in a bad state and reactivate1 fails, it could still be reactivated with reactivate2
CommandApdu reactivate1 = connection.getCommandFactory().createReactivate1Command();
ResponseApdu response1 = connection.communicate(reactivate1);
if (!response1.isSuccess()) {
throw new CardException("Reactivating failed!", response1.getSw());
}
connection.communicate(reactivate1);
CommandApdu reactivate2 = connection.getCommandFactory().createReactivate2Command();
ResponseApdu response2 = connection.communicate(reactivate2);
@@ -70,4 +47,29 @@ public class ResetAndWipeTokenOp {
connection.refreshConnectionCapabilities();
}
private void exhausePw1Tries() throws IOException {
CommandApdu verifyPw1ForSignatureCommand =
connection.getCommandFactory().createVerifyPw1ForSignatureCommand(INVALID_PIN);
int pw1TriesLeft = Math.max(3, connection.getOpenPgpCapabilities().getPw1TriesLeft());
for (int i = 0; i < pw1TriesLeft; i++) {
ResponseApdu response = connection.communicate(verifyPw1ForSignatureCommand);
if (response.isSuccess()) {
throw new CardException("Should never happen, PIN XXXXXXXX has been accepted!", response.getSw());
}
}
}
private void exhaustPw3Tries() throws IOException {
CommandApdu verifyPw3Command = connection.getCommandFactory().createVerifyPw3Command(INVALID_PIN);
int pw3TriesLeft = Math.max(3, connection.getOpenPgpCapabilities().getPw3TriesLeft());
for (int i = 0; i < pw3TriesLeft; i++) {
ResponseApdu response = connection.communicate(verifyPw3Command);
if (response.isSuccess()) { // Should NOT accept!
throw new CardException("Should never happen, PIN XXXXXXXX has been accepted!", response.getSw());
}
}
}
}