Merge remote-tracking branch 'ledger/master'

Author: Bertrand256

README.md

@@ -21,4 +21,17 @@ Building on Windows
   - Install Microsoft Visual C++ Compiler for Python 2.7 from http://www.microsoft.com/en-us/download/details.aspx?id=44266
   - Download and install PyQt4 for Python 2.7 from https://www.riverbankcomputing.com/software/pyqt/download 
   - Install the btchip library (open a command prompt and enter c:\python27\scripts\pip install btchip)
+  
+Building/Installing on FreeBSD
+------------------------------
+  
+On FreeBSD you can install the packages:
 
+    pkg install security/py-btchip
+
+or build via ports:
+
+    cd /usr/ports/security/py-btchip
+    make install clean
+
+  

btchip/btchip.py

@@ -149,7 +149,7 @@ def getTrustedInput(self, transaction, index):
 			apdu.extend(params)
 			self.dongle.exchange(bytearray(apdu))
 			offset = 0
-			while (offset < len(trinput.script)):
+			while True:
 				blockLength = 251
 				if ((offset + blockLength) < len(trinput.script)):
 					dataLength = blockLength
@@ -162,6 +162,8 @@ def getTrustedInput(self, transaction, index):
 				apdu.extend(params)
 				self.dongle.exchange(bytearray(apdu))
 				offset += dataLength
+				if (offset >= len(trinput.script)):
+					break
 		# Number of outputs
 		apdu = [ self.BTCHIP_CLA, self.BTCHIP_INS_GET_TRUSTED_INPUT, 0x80, 0x00 ]
 		params = []

setup.py

@@ -7,7 +7,7 @@
 here = dirname(__file__)
 setup(
     name='btchip-python',
-    version='0.1.21',
+    version='0.1.23',
     author='BTChip',
     author_email='hello@ledger.fr',
     description='Python library to communicate with Ledger Nano dongle',