From 2debc23ce047f87e609494248f0c4cb0d2fc9079 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Fri, 6 Oct 2017 19:06:43 +0200
Subject: [PATCH] slightly nicer error reporting for security token cla
 chaining

---
 .../keychain/securitytoken/SecurityTokenHelper.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
index 5e80a8c7c..980c28888 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
@@ -796,10 +796,10 @@ public class SecurityTokenHelper {
                 int cla = apdu.getCLA() + (last ? 0 : MASK_CLA_CHAINING);
 
                 lastResponse = mTransport.transceive(new CommandAPDU(cla, apdu.getINS(), apdu.getP1(),
-                        apdu.getP2(), Arrays.copyOfRange(data, offset, offset + curLen), ne));
+                        apdu.getP2(), data, offset, curLen, ne));
 
                 if (!last && lastResponse.getSW() != APDU_SW_SUCCESS) {
-                    throw new UsbTransportException("Failed to chain apdu");
+                    throw new UsbTransportException("Failed to chain apdu (last SW: " + lastResponse.getSW() + ")");
                 }
 
                 offset += curLen;