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

improve card decrypt with constants

Browse source
This commit is contained in:
Dominik Schürmann 2021-04-21 14:47:49 +02:00
parent 28c23f84bf
commit a9b28dd11c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/operations/PsoDecryptTokenOp.java
View file

@ -59,6 +59,10 @@ public class PsoDecryptTokenOp {
private final SecurityTokenConnection connection; private final SecurityTokenConnection connection;
private final JcaKeyFingerprintCalculator fingerprintCalculator; private final JcaKeyFingerprintCalculator fingerprintCalculator;
private static final byte[] DECIPHER_EXTERNAL_PUBLIC_KEY = Hex.decode("86");
private static final byte[] DECIPHER_PUBLIC_KEY_DO = Hex.decode("7F49");
private static final byte[] DECIPHER_CIPHER_DO = Hex.decode("A6");
public static PsoDecryptTokenOp create(SecurityTokenConnection connection) { public static PsoDecryptTokenOp create(SecurityTokenConnection connection) {
return new PsoDecryptTokenOp(connection, new JcaKeyFingerprintCalculator()); return new PsoDecryptTokenOp(connection, new JcaKeyFingerprintCalculator());
} }
@ -123,21 +127,21 @@ public class PsoDecryptTokenOp {
} else { } else {
dataLen = new byte[]{(byte) 0x81, (byte) psoDecipherPayload.length}; dataLen = new byte[]{(byte) 0x81, (byte) psoDecipherPayload.length};
} }
psoDecipherPayload = Arrays.concatenate(Hex.decode("86"), dataLen, psoDecipherPayload); psoDecipherPayload = Arrays.concatenate(DECIPHER_EXTERNAL_PUBLIC_KEY, dataLen, psoDecipherPayload);
if (psoDecipherPayload.length < 128) { if (psoDecipherPayload.length < 128) {
dataLen = new byte[]{(byte) psoDecipherPayload.length}; dataLen = new byte[]{(byte) psoDecipherPayload.length};
} else { } else {
dataLen = new byte[]{(byte) 0x81, (byte) psoDecipherPayload.length}; dataLen = new byte[]{(byte) 0x81, (byte) psoDecipherPayload.length};
} }
psoDecipherPayload = Arrays.concatenate(Hex.decode("7F49"), dataLen, psoDecipherPayload); psoDecipherPayload = Arrays.concatenate(DECIPHER_PUBLIC_KEY_DO, dataLen, psoDecipherPayload);
if (psoDecipherPayload.length < 128) { if (psoDecipherPayload.length < 128) {
dataLen = new byte[]{(byte) psoDecipherPayload.length}; dataLen = new byte[]{(byte) psoDecipherPayload.length};
} else { } else {
dataLen = new byte[]{(byte) 0x81, (byte) psoDecipherPayload.length}; dataLen = new byte[]{(byte) 0x81, (byte) psoDecipherPayload.length};
} }
psoDecipherPayload = Arrays.concatenate(Hex.decode("A6"), dataLen, psoDecipherPayload); psoDecipherPayload = Arrays.concatenate(DECIPHER_CIPHER_DO, dataLen, psoDecipherPayload);
CommandApdu command = connection.getCommandFactory().createDecipherCommand( CommandApdu command = connection.getCommandFactory().createDecipherCommand(
psoDecipherPayload, encryptedPoint.length); psoDecipherPayload, encryptedPoint.length);