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

SecurityToken: reenable fidesmo checks

Browse Source
This commit is contained in:
Nikita Mikhailov
2016-05-14 21:22:26 +06:00
parent 0954684441
commit 16b47acee8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,7 +163,7 @@ public class SecurityTokenHelper {
// Connect on smartcard layer // Connect on smartcard layer
// Command APDU (page 51) for SELECT FILE command (page 29) // Command APDU (page 51) for SELECT FILE command (page 29)
CommandAPDU select = new CommandAPDU(0x00, 0xA4, 0x04, 0x00, Hex.decode("D27600012401"), MAX_APDU_NE_EXT); CommandAPDU select = new CommandAPDU(0x00, 0xA4, 0x04, 0x00, Hex.decode("D27600012401"));
ResponseAPDU response = communicate(select); // activate connection ResponseAPDU response = communicate(select); // activate connection
if (response.getSW() != APDU_SW_SUCCESS) { if (response.getSW() != APDU_SW_SUCCESS) {
@@ -608,8 +608,7 @@ public class SecurityTokenHelper {
} }
public boolean isFidesmoToken() { public boolean isFidesmoToken() {
return false; // TODO if (isConnected()) { // Check if we can still talk to the card
/*if (isConnected()) { // Check if we can still talk to the card
try { try {
// By trying to select any apps that have the Fidesmo AID prefix we can // By trying to select any apps that have the Fidesmo AID prefix we can
// see if it is a Fidesmo device or not // see if it is a Fidesmo device or not
@@ -619,7 +618,7 @@ public class SecurityTokenHelper {
Log.e(Constants.TAG, "Card communication failed!", e); Log.e(Constants.TAG, "Card communication failed!", e);
} }
} }
return false;*/ return false;
} }
/** /**