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

token: send Ne only on last in a chain

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-03-24 14:14:30 +01:00
parent 52c8824969
commit 9a86d45bc1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCommandApduFactory.java
View File

@@ -221,14 +221,18 @@ public class OpenPgpCommandApduFactory {
int offset = 0; int offset = 0;
byte[] data = apdu.getData(); byte[] data = apdu.getData();
int ne = Math.min(apdu.getNe(), MAX_APDU_NE);
while (offset < data.length) { while (offset < data.length) {
int curLen = Math.min(MAX_APDU_NC, data.length - offset); int curLen = Math.min(MAX_APDU_NC, data.length - offset);
boolean last = offset + curLen >= data.length; boolean last = offset + curLen >= data.length;
int cla = apdu.getCLA() + (last ? 0 : MASK_CLA_CHAINING); int cla = apdu.getCLA() + (last ? 0 : MASK_CLA_CHAINING);
CommandApdu cmd = CommandApdu cmd;
CommandApdu.create(cla, apdu.getINS(), apdu.getP1(), apdu.getP2(), data, offset, curLen, ne); if (last) {
int ne = Math.min(apdu.getNe(), MAX_APDU_NE);
cmd = CommandApdu.create(cla, apdu.getINS(), apdu.getP1(), apdu.getP2(), data, offset, curLen, ne);
} else {
cmd = CommandApdu.create(cla, apdu.getINS(), apdu.getP1(), apdu.getP2(), data, offset, curLen);
}
result.add(cmd); result.add(cmd);
offset += curLen; offset += curLen;