aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-05-08 14:51:24 +0300
committerDominik Schürmann <dominik@dominikschuermann.de>2016-05-08 14:51:24 +0300
commit5bb4b1955e25770cc9c79d1287e8b15a15171174 (patch)
treee08747ed7147cb016c008a3d6583cb723e0703de
parentb610dd58976d615545d84aba7f4692cc9340814c (diff)
parentf54267dd68b36b6fa3d4e3b8f5bb356c466ead66 (diff)
downloadopen-keychain-5bb4b1955e25770cc9c79d1287e8b15a15171174.tar.gz
open-keychain-5bb4b1955e25770cc9c79d1287e8b15a15171174.tar.bz2
open-keychain-5bb4b1955e25770cc9c79d1287e8b15a15171174.zip
Merge pull request #1858 from nmikhailov/fix4k
SecurityToken: add support for 3072 & 4096bit RSA keys
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java49
1 files changed, 32 insertions, 17 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 30893afb6..bc1c42f7f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
@@ -47,6 +47,7 @@ import nordpol.Apdu;
* For the full specs, see http://g10code.com/docs/openpgp-card-2.0.pdf
*/
public class SecurityTokenHelper {
+ private static final int MAX_APDU_DATAFIELD_SIZE = 254;
// Fidesmo constants
private static final String FIDESMO_APPS_AID_PREFIX = "A000000617";
@@ -248,30 +249,43 @@ public class SecurityTokenHelper {
* @param encryptedSessionKey the encoded session key
* @return the decoded session key
*/
- public byte[] decryptSessionKey(byte[] encryptedSessionKey) throws IOException {
+ public byte[] decryptSessionKey(@NonNull byte[] encryptedSessionKey) throws IOException {
if (!mPw1ValidatedForDecrypt) {
verifyPin(0x82); // (Verify PW1 with mode 82 for decryption)
}
- String firstApdu = "102a8086fe";
- String secondApdu = "002a808603";
- String le = "00";
+ int offset = 1; // Skip first byte
+ String response = "", status = "";
- byte[] one = new byte[254];
- // leave out first byte:
- System.arraycopy(encryptedSessionKey, 1, one, 0, one.length);
+ // Transmit
+ while (offset < encryptedSessionKey.length) {
+ boolean isLastCommand = offset + MAX_APDU_DATAFIELD_SIZE < encryptedSessionKey.length;
+ String cla = isLastCommand ? "10" : "00";
- byte[] two = new byte[encryptedSessionKey.length - 1 - one.length];
- for (int i = 0; i < two.length; i++) {
- two[i] = encryptedSessionKey[i + one.length + 1];
- }
+ int len = Math.min(MAX_APDU_DATAFIELD_SIZE, encryptedSessionKey.length - offset);
+ response = communicate(cla + "2a8086" + Hex.toHexString(new byte[]{(byte) len})
+ + Hex.toHexString(encryptedSessionKey, offset, len));
+ status = response.substring(response.length() - 4);
- communicate(firstApdu + getHex(one));
- String second = communicate(secondApdu + getHex(two) + le);
+ if (!isLastCommand && !response.endsWith("9000")) {
+ throw new CardException("Deciphering with Security token failed on transmit", parseCardStatus(response));
+ }
+
+ offset += MAX_APDU_DATAFIELD_SIZE;
+ }
- String decryptedSessionKey = getDataField(second);
+ // Receive
+ String result = getDataField(response);
+ while (response.endsWith("61")) {
+ response = communicate("00C00000" + status.substring(2));
+ status = response.substring(response.length() - 4);
+ result += getDataField(response);
+ }
+ if (!status.equals("9000")) {
+ throw new CardException("Deciphering with Security token failed on receive", parseCardStatus(response));
+ }
- return Hex.decode(decryptedSessionKey);
+ return Hex.decode(result);
}
/**
@@ -589,8 +603,9 @@ public class SecurityTokenHelper {
}
// Make sure the signature we received is actually the expected number of bytes long!
- if (signature.length() != 256 && signature.length() != 512) {
- throw new IOException("Bad signature length! Expected 128 or 256 bytes, got " + signature.length() / 2);
+ if (signature.length() != 256 && signature.length() != 512
+ && signature.length() != 768 && signature.length() != 1024) {
+ throw new IOException("Bad signature length! Expected 128/256/384/512 bytes, got " + signature.length() / 2);
}
return Hex.decode(signature);