status-im
/
status-keycard
mirror of https://github.com/status-im/status-keycard.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

correct decryption overlapping offsets

This commit is contained in:
Michele Balistreri 2017-09-26 14:20:23 +03:00
parent 1c56b7fbf2
commit 69a27f4c86
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/im/status/wallet/SecureChannel.java
View File

@ -10,7 +10,6 @@ public class SecureChannel {
public static final short SC_KEY_LENGTH = 256;
public static final short SC_SECRET_LENGTH = 32;
public static final short SC_BLOCK_SIZE = 16;
public static final short SC_OFFSET_CDATA = ISO7816.OFFSET_CDATA + (SC_BLOCK_SIZE * 2);
public static final byte INS_OPEN_SECURE_CHANNEL = 0x10;
@ -54,9 +53,9 @@ public class SecureChannel {
public short decryptAPDU(byte[] apduBuffer) {
scCipher.init(scKey, Cipher.MODE_DECRYPT, apduBuffer, ISO7816.OFFSET_CDATA, SC_BLOCK_SIZE);
short len = scCipher.doFinal(apduBuffer, (short)(ISO7816.OFFSET_CDATA + SC_BLOCK_SIZE), apduBuffer[ISO7816.OFFSET_LC], apduBuffer, SC_OFFSET_CDATA);
short len = scCipher.doFinal(apduBuffer, (short)(ISO7816.OFFSET_CDATA + SC_BLOCK_SIZE), apduBuffer[ISO7816.OFFSET_LC], apduBuffer, ISO7816.OFFSET_CDATA);
while(apduBuffer[(short)(SC_OFFSET_CDATA+len-1)] != (byte) 0x80) {
while(apduBuffer[(short)(ISO7816.OFFSET_CDATA+len-1)] != (byte) 0x80) {
len--;
}

2
src/main/java/im/status/wallet/WalletApplet.java
View File

@ -90,7 +90,7 @@ public class WalletApplet extends Applet {
byte[] apduBuffer = apdu.getBuffer();
short len = secureChannel.decryptAPDU(apduBuffer);
if (!ownerPIN.check(apduBuffer, SecureChannel.SC_OFFSET_CDATA, (byte) len)) {
if (!ownerPIN.check(apduBuffer, ISO7816.OFFSET_CDATA, (byte) len)) {
ISOException.throwIt((short)((short) 0x63c0 | (short) ownerPIN.getTriesRemaining()));
}
}