[enhancement] Small fix in the API to expose both receive and send ma…

…x values.
wookey-project · May 16, 2019 · d3d45fe · d3d45fe
1 parent 82ce39a
commit d3d45fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/wookey/common/SecureChannel.java b/src/wookey/common/SecureChannel.java
@@ -245,9 +245,14 @@ private void add_iv(short num){
  increment_iv();
  }
  }
- public short get_max_sc_apdu_len(){
+ public short get_max_sc_apdu_recv_len(){
+ /* Maximum receive size is Lc max = 255 minus HMAC size */
  return (short)(255 - hmac_ctx.hmac_len());
  }
+ public short get_max_sc_apdu_send_len(){
+ /* Maximum send size is Le max = 256 minux HMAC size */
+ return (short)(256 - hmac_ctx.hmac_len());
+ }
  public short receive_encrypted_apdu(APDU apdu, byte[] outdata){
  short receivedLen = apdu.setIncomingAndReceive();
  byte buffer[] = apdu.getBuffer();

diff --git a/src/wookey/common/WooKey.java b/src/wookey/common/WooKey.java
@@ -433,9 +433,9 @@ private void get_random(APDU apdu, byte ins){
  return;
  }
  else{
- /* This instruction expects a byte containing the size of random data to provide (maximum 255 bytes minus a HMAC size) */
+ /* This instruction expects a byte containing the size of random data to provide (maximum 256 bytes minus a HMAC size) */
  short rand_len = (short)(data[0] & 0x00ff);
- if(rand_len > schannel.get_max_sc_apdu_len()){
+ if(rand_len > schannel.get_max_sc_apdu_send_len()){
  schannel.send_encrypted_apdu(apdu, null, (short) 0, (short) 0, ins, (byte) 0x03);
  return;
  }