PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

handle unavailable pins better for SecurityTokenConnection

Browse source
This commit is contained in:
Vincent Breitmoser 2017-11-22 14:57:36 +01:00
parent bf173b1e65
commit 21d533902e
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
View file

@ -23,6 +23,7 @@ package org.sufficientlysecure.keychain.securitytoken;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import org.bouncycastle.asn1.ASN1Encodable;
@ -86,7 +87,7 @@ public class SecurityTokenConnection {
@NonNull
private final Transport mTransport;
@NonNull
@Nullable
private final Passphrase mPin;
private final OpenPgpCommandApduFactory commandFactory;
@ -99,16 +100,24 @@ public class SecurityTokenConnection {
private boolean mPw1ValidatedForDecrypt; // Mode 82 does other things; consider renaming?
private boolean mPw3Validated;
public static SecurityTokenConnection getInstanceForTransport(Transport transport, Passphrase pin) {
public static SecurityTokenConnection getInstanceForTransport(
@NonNull Transport transport, @Nullable Passphrase pin) {
if (sCachedInstance == null || !sCachedInstance.isPersistentConnectionAllowed() ||
!sCachedInstance.isConnected() || !sCachedInstance.mTransport.equals(transport)) {
!sCachedInstance.isConnected() || !sCachedInstance.mTransport.equals(transport) ||
(pin != null && !pin.equals(sCachedInstance.mPin))) {
sCachedInstance = new SecurityTokenConnection(transport, pin, new OpenPgpCommandApduFactory());
}
return sCachedInstance;
}
public static void clearCachedConnections() {
sCachedInstance = null;
}
@VisibleForTesting
SecurityTokenConnection(@NonNull Transport transport, @NonNull Passphrase pin,
SecurityTokenConnection(@NonNull Transport transport, @Nullable Passphrase pin,
OpenPgpCommandApduFactory commandFactory) {
this.mTransport = transport;
this.mPin = pin;
@ -433,6 +442,9 @@ public class SecurityTokenConnection {
* Verifies the user's PW1 with the appropriate mode.
*/
private void verifyPinForSignature() throws IOException {
if (mPin == null) {
throw new IllegalStateException("Connection not initialized with Pin!");
}
byte[] pin = mPin.toStringUnsafe().getBytes();
ResponseApdu response = communicate(commandFactory.createVerifyPw1ForSignatureCommand(pin));
@ -447,6 +459,10 @@ public class SecurityTokenConnection {
* Verifies the user's PW1 with the appropriate mode.
*/
private void verifyPinForOther() throws IOException {
if (mPin == null) {
throw new IllegalStateException("Connection not initialized with Pin!");
}
byte[] pin = mPin.toStringUnsafe().getBytes();
// Command APDU for VERIFY command (page 32)

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
View file

@ -298,6 +298,8 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenActivity {
stConnection.modifyPw3Pin(newAdminPin, adminPin);
stConnection.resetPin(newPin, new Passphrase(new String(newAdminPin)));
SecurityTokenConnection.clearCachedConnections();
break;
}
case SECURITY_TOKEN_RESET_CARD: {