fix getkeylabels

Author: onlykey

onlykey/cli.py

@@ -155,10 +155,11 @@ def prompt_pin():
             tmp = {}
             for slot in only_key.getkeylabels():
                 tmp[slot.name] = slot
-            slots = iter(['RSA Key 1', 'RSA Key 2', 'RSA Key 3', 'RSA Key 4', 'ECC Key 1', 'ECC Key 2', 'ECC Key 3', 'ECC Key 4', 'ECC Key 5', 'ECC Key 6', 'ECC Key 7', 'ECC Key 8', 'ECC Key 9', 'ECC Key 10', 'ECC Key 11', 'ECC Key 12', 'ECC Key 13', 'ECC Key 14', 'ECC Key 19', 'ECC Key 20', 'ECC Key 21', 'ECC Key 22', 'ECC Key 23', 'ECC Key 24', 'ECC Key 25', 'ECC Key 26', 'ECC Key 27', 'ECC Key 28', 'ECC Key 29', 'ECC Key 30', 'ECC Key 31', 'ECC Key 32'])
+            slots = iter(['RSA Key 1', 'RSA Key 2', 'RSA Key 3', 'RSA Key 4', 'ECC Key 1', 'ECC Key 2', 'ECC Key 3', 'ECC Key 4', 'ECC Key 5', 'ECC Key 6', 'ECC Key 7', 'ECC Key 8', 'ECC Key 9', 'ECC Key 10', 'ECC Key 11', 'ECC Key 12', 'ECC Key 13', 'ECC Key 14', 'ECC Key 15', 'ECC Key 16', 'ECC Key 17', 'ECC Key 18', 'ECC Key 19', 'ECC Key 20', 'ECC Key 21', 'ECC Key 22', 'ECC Key 23', 'ECC Key 24', 'ECC Key 25', 'ECC Key 26', 'ECC Key 27', 'ECC Key 28', 'ECC Key 29', 'ECC Key 30', 'ECC Key 31', 'ECC Key 32'])
             for slot_name in slots:
                 print(tmp[slot_name].to_str())
                 print(tmp[next(slots)].to_str())
+                print()
 
         elif sys.argv[1] == 'setslot':
             try:

onlykey/client.py

@@ -340,7 +340,7 @@ def read_bytes(self, n=64, to_str=False, timeout_ms=100):
         # Returns the raw list
         return out
 
-    def read_string(self, timeout_ms=2000):
+    def read_string(self, timeout_ms=100):
         """Read an ASCII string."""
         return ''.join([chr(item) for item in self.read_bytes(MAX_INPUT_REPORT_SIZE, timeout_ms=timeout_ms) if item != 0])
 
@@ -367,12 +367,13 @@ def getkeylabels(self):
         No need to read messages.
         """
         self.send_message(msg=Message.OKGETLABELS, slot_id=107)
-        time.sleep(2)
+        time.sleep(0)
         slots = []
         for _ in range(36):
             data = self.read_string().split('|')
-            print 'Received= ', repr(data)
+            print 'data ', repr(data)
             slot_number = ord(data[0])
+            print 'slot_number ', repr(slot_number)
             if 25 <= slot_number <= 60:
                 slots.append(Slot(slot_number, label=data[1]))
         return slots