Fix parsing, bump version

Author: btchip

btchip/btchip.py

@@ -272,16 +272,19 @@ def finalizeInput(self, outputAddress, amount, fees, changePath, rawTx=None):
 		if result['confirmationType'] == 0x02:
 			result['keycardData'] = response[1 + response[0] + 1:]
 		if result['confirmationType'] == 0x03:
-			offset = 1 + response[0]
-			result['keycardData'] = response[offset + 1 : offset + 1 + response[offset]]
+			offset = 1 + response[0] + 1 
+			keycardDataLength = response[offset]
 			offset = offset + 1
+			result['keycardData'] = response[offset : offset + keycardDataLength]
+			offset = offset + keycardDataLength
 			result['secureScreenData'] = response[offset:]
 		result['outputData'] = response[1 : 1 + response[0]]
 		return result
 
 	def finalizeInputFull(self, outputData):
 		result = {}
 		offset = 0
+		encryptedOutputData = ""
 		while (offset < len(outputData)):
 			blockLength = 255
 			if ((offset + blockLength) < len(outputData)):
@@ -294,13 +297,22 @@ def finalizeInputFull(self, outputData):
 			p1, 0x00, dataLength ]
 			apdu.extend(outputData[offset : offset + dataLength])
 			response = self.dongle.exchange(bytearray(apdu))
+			encryptedOutputData = encryptedOutputData + response[1 : 1 + response[0]]
 			offset += dataLength
-		result['confirmationNeeded'] = response[0] <> 0x00
-		result['confirmationType'] = response[0]
-		if result['confirmationType'] == 0x02:
-			result['keycardData'] = response[1:]
-		if result['confirmationType'] == 0x03:
-			result['secureScreenData'] = response[1:]
+                result['confirmationNeeded'] = response[1 + response[0]] <> 0x00
+                result['confirmationType'] = response[1 + response[0]]
+                if result['confirmationType'] == 0x02:
+			offset = 1 + response[0] + 1
+			keycardDataLength = response[offset]
+                        result['keycardData'] = response[offset : offset + keycardDataLength]
+                if result['confirmationType'] == 0x03:
+                        offset = 1 + response[0] + 1
+                        keycardDataLength = response[offset]
+                        offset = offset + 1
+                        result['keycardData'] = response[offset : offset + keycardDataLength]
+                        offset = offset + keycardDataLength
+                        result['secureScreenData'] = response[offset:]
+                result['encryptedOutputData'] = encryptedOutputData 
 		return result
 
 	def untrustedHashSign(self, path, pin="", lockTime=0, sighashType=0x01):

setup.py

@@ -7,7 +7,7 @@
 here = dirname(__file__)
 setup(
     name='btchip-python',
-    version='0.1.15',
+    version='0.1.16',
     author='BTChip',
     author_email='[email protected]',
     description='Python library to communicate with Ledger Nano dongle',