key slot lables

Author: onlykey

onlykey/cli.py

@@ -151,17 +151,17 @@ def prompt_pin():
                 tmp[slot.name] = slot
             slots = iter(['1a', '1b', '2a', '2b', '3a', '3b', '4a', '4b', '5a', '5b', '6a', '6b'])
             for slot_name in slots:
-                print(tmp[slot_name].to_str())
-                print(tmp[next(slots)].to_str())
+                print(tmp[slot_name].to_str().replace('ÿ'," "))
+                print(tmp[next(slots)].to_str().replace('ÿ'," "))
                 print()
 
         elif sys.argv[1] == 'getkeylabels':
             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 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'])
+            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'])
             for slot_name in slots:
-                print(tmp[slot_name].to_str())
+                print(tmp[slot_name].to_str().replace('ÿ'," "))
 
         elif sys.argv[1] == 'setslot':
             try:
@@ -379,17 +379,17 @@ def mprompt():
                     tmp[slot.name] = slot
                 slots = iter(['1a', '1b', '2a', '2b', '3a', '3b', '4a', '4b', '5a', '5b', '6a', '6b'])
                 for slot_name in slots:
-                    print(tmp[slot_name].to_str())
-                    print(tmp[next(slots)].to_str())
+                    print(tmp[slot_name].to_str().replace('ÿ'," "))
+                    print(tmp[next(slots)].to_str().replace('ÿ'," "))
                     print()
 
             if data[0] == 'getkeylabels':
                 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'])
+                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'])
                 for slot_name in slots:
-                    print(tmp[slot_name].to_str())
+                    print(tmp[slot_name].to_str().replace('ÿ'," "))
 
             elif data[0] == 'setslot':
                 try:

onlykey/client.py

@@ -352,6 +352,20 @@ def read_bytes(self, n=64, to_str=False, timeout_ms=100):
             raise RuntimeError('Error OnlyKey must be configured first')
         elif outstr.decode(errors="ignore").find("Timeout occured while waiting for confirmation on OnlyKey") != -1:
             raise RuntimeError('Timeout occured while waiting for confirmation on OnlyKey')
+        elif outstr.decode(errors="ignore").find("Error key not set as signature key") != -1:
+            raise RuntimeError('Error key not set as signature key')
+        elif outstr.decode(errors="ignore").find("Error key not set as decryption key") != -1:
+            raise RuntimeError('Error key not set as decryption key')
+        elif outstr.decode(errors="ignore").find("Error with RSA data to sign invalid size") != -1:
+            raise RuntimeError('Error with RSA data to sign invalid size')
+        elif outstr.decode(errors="ignore").find("Error with RSA signing") != -1:
+            raise RuntimeError('Error with RSA signing')
+        elif outstr.decode(errors="ignore").find("Error with RSA data to decrypt invalid size") != -1:
+            raise RuntimeError('Error with RSA data to decrypt invalid size')
+        elif outstr.decode(errors="ignore").find("Error with RSA decryption") != -1:
+            raise RuntimeError('Error with RSA decryption')
+        elif outstr.decode(errors="ignore").find("Error no key set in this slot") != -1:
+            raise RuntimeError('Error no key set in this slot')
 
         if to_str:
             # Returns the bytes a string if requested
@@ -393,10 +407,10 @@ def getkeylabels(self):
         self.send_message(msg=Message.OKGETLABELS, slot_id=107)
         time.sleep(0)
         slots = []
-        for _ in range(33):
+        for _ in range(20):
             data = self.read_string().split('|')
             slot_number = ord(data[0])
-            if 25 <= slot_number <= 57:
+            if 25 <= slot_number <= 44:
                 slots.append(Slot(slot_number, label=data[1]))
 
         return slots