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

support devices without SecureChannel capability

This commit is contained in:
Michele Balistreri 2019-02-26 12:07:42 +03:00
parent 527efc7a4e
commit 07cba4aa9d
2 changed files with 60 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
desktop/src/main/java/im/status/keycard/desktop/LedgerUSBChannel.java
View File

@ -7,7 +7,6 @@ import org.hid4java.HidDevice;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
public class LedgerUSBChannel implements CardChannel {
private static final int HID_BUFFER_SIZE = 64;
@ -30,6 +29,7 @@ public class LedgerUSBChannel implements CardChannel {
byte[] command = wrapCommandAPDU(cmd.serialize());
byte[] chunk = new byte[HID_BUFFER_SIZE];
while(offset != command.length) {
int blockSize = (command.length - offset > HID_BUFFER_SIZE ? HID_BUFFER_SIZE : command.length - offset);
System.arraycopy(command, offset, chunk, 0, blockSize);
@ -55,42 +55,22 @@ public class LedgerUSBChannel implements CardChannel {
}
private byte[] unwrapResponseAPDU(byte[] data) throws IOException {
ByteArrayOutputStream response = new ByteArrayOutputStream();
int offset = 0;
int responseLength;
int sequenceIdx = 0;
if ((data == null) || (data.length < 7 + 5)) {
return null;
}
if (data[offset++] != (LEDGER_DEFAULT_CHANNEL >> 8)) {
throw new IOException("Invalid channel");
}
int sequenceIdx = 0;
int offset = checkResponseHeader(data, 0, sequenceIdx);
if (data[offset++] != (LEDGER_DEFAULT_CHANNEL & 0xff)) {
throw new IOException("Invalid channel");
}
if (data[offset++] != TAG_APDU) {
throw new IOException("Invalid tag");
}
if (data[offset++] != 0x00) {
throw new IOException("Invalid sequence");
}
if (data[offset++] != 0x00) {
throw new IOException("Invalid sequence");
}
responseLength = ((data[offset++] & 0xff) << 8);
int responseLength = ((data[offset++] & 0xff) << 8);
responseLength |= (data[offset++] & 0xff);
if (data.length < 7 + responseLength) {
return null;
}
ByteArrayOutputStream response = new ByteArrayOutputStream();
int blockSize = (responseLength > HID_BUFFER_SIZE - 7 ? HID_BUFFER_SIZE - 7 : responseLength);
response.write(data, offset, blockSize);
offset += blockSize;
@ -102,25 +82,7 @@ public class LedgerUSBChannel implements CardChannel {
return null;
}
if (data[offset++] != (LEDGER_DEFAULT_CHANNEL >> 8)) {
throw new IOException("Invalid channel");
}
if (data[offset++] != (LEDGER_DEFAULT_CHANNEL & 0xff)) {
throw new IOException("Invalid channel");
}
if (data[offset++] != TAG_APDU) {
throw new IOException("Invalid tag");
}
if (data[offset++] != (sequenceIdx >> 8)) {
throw new IOException("Invalid sequence");
}
if (data[offset++] != (sequenceIdx & 0xff)) {
throw new IOException("Invalid sequence");
}
offset = checkResponseHeader(data, offset, sequenceIdx);
blockSize = (responseLength - response.size() > HID_BUFFER_SIZE - 5 ? HID_BUFFER_SIZE - 5 : responseLength - response.size());
if (blockSize > data.length - offset) {
@ -133,17 +95,37 @@ public class LedgerUSBChannel implements CardChannel {
return response.toByteArray();
}
private int checkResponseHeader(byte[] data, int offset, int sequenceIdx) throws IOException {
if (data[offset++] != (LEDGER_DEFAULT_CHANNEL >> 8)) {
throw new IOException("Invalid channel");
}
if (data[offset++] != (LEDGER_DEFAULT_CHANNEL & 0xff)) {
throw new IOException("Invalid channel");
}
if (data[offset++] != TAG_APDU) {
throw new IOException("Invalid tag");
}
if (data[offset++] != (sequenceIdx >> 8)) {
throw new IOException("Invalid sequence");
}
if (data[offset++] != (sequenceIdx & 0xff)) {
throw new IOException("Invalid sequence");
}
return offset;
}
private byte[] wrapCommandAPDU(byte[] command) {
ByteArrayOutputStream output = new ByteArrayOutputStream();
int sequenceIdx = 0;
int offset = 0;
output.write(LEDGER_DEFAULT_CHANNEL >> 8);
output.write(LEDGER_DEFAULT_CHANNEL);
output.write(TAG_APDU);
output.write(sequenceIdx >> 8);
output.write(sequenceIdx);
writeCommandHeader(output, sequenceIdx);
sequenceIdx++;
output.write(command.length >> 8);
output.write(command.length);
int blockSize = (command.length > HID_BUFFER_SIZE - 7 ? HID_BUFFER_SIZE - 7 : command.length);
@ -151,12 +133,9 @@ public class LedgerUSBChannel implements CardChannel {
offset += blockSize;
while (offset != command.length) {
output.write(LEDGER_DEFAULT_CHANNEL >> 8);
output.write(LEDGER_DEFAULT_CHANNEL);
output.write(TAG_APDU);
output.write(sequenceIdx >> 8);
output.write(sequenceIdx);
writeCommandHeader(output, sequenceIdx);
sequenceIdx++;
blockSize = (command.length - offset > HID_BUFFER_SIZE - 5 ? HID_BUFFER_SIZE - 5 : command.length - offset);
output.write(command, offset, blockSize);
offset += blockSize;
@ -170,6 +149,14 @@ public class LedgerUSBChannel implements CardChannel {
return output.toByteArray();
}
private void writeCommandHeader(ByteArrayOutputStream output, int sequenceIdx) {
output.write(LEDGER_DEFAULT_CHANNEL >> 8);
output.write(LEDGER_DEFAULT_CHANNEL);
output.write(TAG_APDU);
output.write(sequenceIdx >> 8);
output.write(sequenceIdx);
}
@Override
public boolean isConnected() {
return hidDevice.isOpen();

24
lib/src/main/java/im/status/keycard/applet/KeycardCommandSet.java
View File

@ -70,6 +70,7 @@ public class KeycardCommandSet {
private final CardChannel apduChannel;
private SecureChannelSession secureChannel;
private ApplicationInfo info;
/**
* Creates a KeycardCommandSet using the given APDU Channel
@ -80,6 +81,16 @@ public class KeycardCommandSet {
this.secureChannel = new SecureChannelSession();
}
/**
* Returns the application info as stored from the last sent SELECT command. Returns null if no succesful SELECT
* command has been sent using this command set.
*
* @return the application info object
*/
public ApplicationInfo getApplicationInfo() {
return info;
}
/**
* Set the SecureChannel object
* @param secureChannel secure channel
@ -126,9 +137,14 @@ public class KeycardCommandSet {
APDUCommand selectApplet = new APDUCommand(0x00, 0xA4, 4, 0, Identifiers.getKeycardInstanceAID(instanceIdx));
APDUResponse resp = apduChannel.send(selectApplet);
if (resp.getSw() == 0x9000) {
this.secureChannel.generateSecret(extractPublicKeyFromSelect(resp.getData()));
this.secureChannel.reset();
info = new ApplicationInfo(resp.getData());
if (info.hasSecureChannelCapability()) {
this.secureChannel.generateSecret(info.getSecureChannelPubKey());
this.secureChannel.reset();
}
}
return resp;
@ -660,8 +676,4 @@ public class KeycardCommandSet {
APDUCommand init = new APDUCommand(0x80, INS_INIT, 0, 0, secureChannel.oneShotEncrypt(initData));
return apduChannel.send(init);
}
private byte[] extractPublicKeyFromSelect(byte[] select) {
return new ApplicationInfo(select).getSecureChannelPubKey();
}
}