Merge branch 'master' into yubikey-nano-support

Author: dahu33

NEWS

@@ -1,3 +1,6 @@
+* Version 3.0.1 (released 2017-06-14)
+ ** Improved Python 3 compatibility.
+
 * Version 3.0.0 (released 2016-04-11)
  ** Added support for Python 3.3+.
  ** utils.rand_bytes() now sources bytes from os.urandom().

u2flib_host/__init__.py

@@ -25,4 +25,4 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = "3.0.0"
+__version__ = "3.0.2-dev0"

u2flib_host/authenticate.py

@@ -103,7 +103,7 @@ def parse_args():
 def main():
     args = parse_args()
 
-    facet = text_type(args.facet, sys.stdin.encoding or sys.getdefaultencoding())
+    facet = text_type(args.facet)
     if args.infile:
         with open(args.infile, 'r') as f:
             data = f.read()
@@ -112,8 +112,7 @@ def main():
             sys.stderr.write('Enter AuthenticateRequest JSON data...\n')
         data = sys.stdin.read()
 
-    params = json.loads(data, object_hook=u2str)
-
+    params = json.loads(data)
     if args.soft:
         from u2flib_host.soft import SoftU2FDevice
         devices = [SoftU2FDevice(args.soft)]

u2flib_host/device.py

@@ -72,7 +72,7 @@ def get_supported_versions(self):
         """
         if not hasattr(self, '_versions'):
             try:
-                self._versions = [self.send_apdu(INS_GET_VERSION)]
+                self._versions = [self.send_apdu(INS_GET_VERSION).decode()]
             except exc.APDUError as e:
                 # v0 didn't support the instruction.
                 self._versions = ['v0'] if e.code == 0x6d00 else []

u2flib_host/hid_transport.py

@@ -59,24 +59,28 @@
 # USB Commands
 CMD_INIT = 0x06
 CMD_WINK = 0x08
+CMD_PING = 0x01
 CMD_APDU = 0x03
+CMD_LOCK = 0x04
 U2FHID_YUBIKEY_DEVICE_CONFIG = U2F_VENDOR_FIRST
 
 STAT_ERR = 0xbf
 
-def list_devices():
+
+def list_devices(dev_class=None):
+    dev_class = dev_class or HIDDevice
     devices = []
     for d in hid.enumerate(0, 0):
         usage_page = d['usage_page']
         if usage_page == 0xf1d0 and d['usage'] == 1:
-            devices.append(HIDDevice(d['path']))
+            devices.append(dev_class(d['path']))
         # Usage page doesn't work on Linux
         elif (d['vendor_id'], d['product_id']) in DEVICES:
             device = HIDDevice(d['path'])
             try:
                 device.open()
                 device.close()
-                devices.append(HIDDevice(d['path']))
+                devices.append(dev_class(d['path']))
             except:
                 pass
     return devices
@@ -136,6 +140,15 @@ def _do_send_apdu(self, apdu_data):
     def wink(self):
         self.call(CMD_WINK)
 
+    def ping(self, msg=b'Hello U2F'):
+        resp = self.call(CMD_PING, msg)
+        if resp != msg:
+            raise exc.DeviceError("Incorrect PING readback")
+        return resp
+
+    def lock(self, lock_time=10):
+        self.call(CMD_LOCK, lock_time)
+
     def _send_req(self, cid, cmd, data):
         size = len(data)
         bc_l = int2byte(size & 0xff)
@@ -160,7 +173,7 @@ def _read_resp(self, cid, cmd):
             resp_vals = _read_timeout(self.handle, HID_RPT_SIZE)
             resp = b''.join(int2byte(v) for v in resp_vals)
             if resp[:5] == cid + int2byte(STAT_ERR):
-                raise U2FHIDError(byte2int(resp[6]))
+                raise U2FHIDError(byte2int(resp[7]))
 
         if not resp:
             raise exc.DeviceError("Invalid response from device!")
@@ -175,7 +188,7 @@ def _read_resp(self, cid, cmd):
             resp = b''.join(int2byte(v) for v in resp_vals)
             if resp[:4] != cid:
                 raise exc.DeviceError("Wrong CID from device!")
-            if byte2int(resp[4:5]) != seq & 0x7f:
+            if byte2int(resp[4]) != seq & 0x7f:
                 raise exc.DeviceError("Wrong SEQ from device!")
             seq += 1
             new_data = resp[5:min(5 + data_len, HID_RPT_SIZE)]

u2flib_host/register.py

@@ -95,15 +95,15 @@ def parse_args():
 def main():
     args = parse_args()
 
-    facet = text_type(args.facet, sys.stdin.encoding or sys.getdefaultencoding())
+    facet = text_type(args.facet)
     if args.infile:
         with open(args.infile, 'r') as f:
             data = f.read()
     else:
         if sys.stdin.isatty():
             sys.stderr.write('Enter RegistrationRequest JSON data...\n')
         data = sys.stdin.read()
-    params = json.loads(data, object_hook=u2str)
+    params = json.loads(data)
 
     if args.soft:
         from u2flib_host.soft import SoftU2FDevice