Merge pull request #24

Author: dainnilsson

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/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