1.2.1

Author: onlykey

onlykey/cli.py

@@ -51,48 +51,8 @@ def prompt_pin():
         return
 
     if len(sys.argv) > 1:
-        if sys.argv[1] == 'ecc':
-            # ECC subcommands
 
-            # Create a new private key
-            if sys.argv[2] == 'new':
-                signing_key, _ = nacl.signing.SigningKey.generate()
-
-                with open('ecc_private.key', 'wb+') as f:
-                    f.write(signing_key.encode(encoder=nacl.encoding.HexEncoder))
-
-                print('ECC private key written to ecc_private.key')
-
-            # Load a private key to the OnlyKey
-            elif sys.argv[2] == 'load':
-
-                privkey = 'ecc_private.key'
-                if len(privkey) == 4:
-                    privkey = sys.argv[3]
-
-                if not os.path.exists(privkey):
-                    print('{} does not exists'.format(privkey))
-
-                with open(privkey, 'rb') as f:
-                    raw_privkey = f.read()
-                    print ()
-                    print ('Enter ECC key slot number to use (1 - 32) or enter 0 to list key labels')
-                    print ()
-                    slot = int(input())
-
-                while slot == 0:
-                    ok.displaykeylabels()
-                    print ()
-                    print ('Enter ECC key slot number to use (1 - 32) or enter 0 to list key labels')
-                    print ()
-                    slot = int(input())
-
-                slot = slot + 100 # ECC keys in slot 101 - 132
-                only_key.set_ecc_key(slot, (1+16+32+64+128), raw_privkey) #set ECC key with all features
-                time.sleep(1.5)
-                print(only_key.read_string())
-
-        elif sys.argv[1] == 'settime':
+        if sys.argv[1] == 'settime':
             only_key.set_time(time.time())
 
         elif sys.argv[1] == 'init':
@@ -281,6 +241,12 @@ def prompt_pin():
         elif sys.argv[1] == 'backupkey':
             only_key.generate_backup_key()
 
+        elif sys.argv[1] == 'setkey':
+            only_key.setkey(sys.argv[2], sys.argv[3], sys.argv[4])
+
+        elif sys.argv[1] == 'wipekey':
+            only_key.wipekey(sys.argv[2])
+
         elif sys.argv[1] == 'idletimeout':
              only_key.setslot(1, MessageField.IDLETIMEOUT, int(sys.argv[2]))
         elif sys.argv[1] == 'wipemode':
@@ -307,7 +273,7 @@ def prompt_pin():
     else:
 
         # Print help.
-        print('OnlyKey CLI v1.2.0')
+        print('OnlyKey CLI v1.2.1')
         print('Control-D to exit.')
         print()
 
@@ -511,6 +477,18 @@ def mprompt():
                 except:
                     continue
 
+            elif data[0] == 'setkey':
+                try:
+                    only_key.setkey(data[1], data[2], data[3])
+                except:
+                    continue
+
+            elif data[0] == 'wipekey':
+                try:
+                    only_key.wipekey(data[1])
+                except:
+                    continue
+
             elif data[0] == 'idletimeout':
                 try:
                     only_key.setslot(1, MessageField.IDLETIMEOUT, int(data[1]))

onlykey/client.py

@@ -216,19 +216,11 @@ def set_time(self, timestamp):
         logging.debug('SENDING OKSETTIME:', [x for x in enumerate(payload)])
         self.send_message(msg=Message.OKSETTIME, payload=payload)
 
-    def set_ecc_key(self, key_type, slot, key):
-        payload = [key_type, slot] + [ord(c) for c in key]
-        self.send_message(msg=Message.OKSETPRIV, payload=payload)
-
-    def set_rsa_key(self, key_type, slot, key):
-        payload = [key_type, slot] + [ord(c) for c in key]
-        self.send_message(msg=Message.OKSETPRIV, payload=payload)
-
-    def send_message(self, payload=None, msg=None, slot_id=None, message_field=None):
+    def send_message(self, payload=None, msg=None, slot_id=None, message_field=None, from_ascii=False):
         """Send a message."""
         logging.debug('preparing payload for writing')
         # Initialize an empty message with the header
-        raw_bytes = list(MESSAGE_HEADER)
+        raw_bytes = bytearray(MESSAGE_HEADER)
 
         # Append the message type (must be `Message` enum value)
         if msg:
@@ -249,9 +241,12 @@ def send_message(self, payload=None, msg=None, slot_id=None, message_field=None)
         if payload:
             if isinstance(payload, (str, str)):
                 logging.debug('payload="%s"', payload)
-                raw_bytes.extend(bytearray.fromhex(payload))
-            elif isinstance(payload, list):
-                logging.debug('payload=%s', ''.join([chr(c) for c in payload]))
+                if from_ascii==True:
+                    raw_bytes.extend(str.encode(payload))
+                else:
+                    raw_bytes.extend(bytearray.fromhex(payload))
+            elif isinstance(payload, list) or isinstance(payload, bytearray):
+                logging.debug('payload=%s', payload)
                 raw_bytes.extend(payload)
             elif isinstance(payload, int):
                 logging.debug('payload=%d', payload)
@@ -319,22 +314,17 @@ def send_large_message2(self, payload=None, msg=None, slot_id=101):
         return
 
 
-    def send_large_message3(self, payload=None, msg=None, slot_id=101, key_type=1):
+    def send_large_message3(self, payload=None, msg=None, key_type=None, slot_id=None):
         """Wrapper for sending large message (larger than 58 bytes) in batch in a transparent way."""
         if not msg:
             raise Exception("Missing msg")
 
         # Split the payload in multiple chunks
+        payload = bytearray.fromhex(payload)
         chunks = [payload[x:x+MAX_LARGE_PAYLOAD_SIZE-1] for x in range(0, len(payload), 57)]
         for chunk in chunks:
-            current_payload = [slot_id, key_type]
-
-            # Append the actual payload
-            if isinstance(chunk, list):
-                current_payload.extend(chunk)
-            else:
-                for c in chunk:
-                    current_payload.append(ord(c))
+            current_payload = [int(slot_id), int(key_type)]
+            current_payload = bytearray(bytes(current_payload)) + payload
             self.send_message(payload=current_payload, msg=msg)
         return
 
@@ -436,9 +426,8 @@ def displaykeylabels(self):
             print(tmp[slot_name].to_str())
 
     def setslot(self, slot_number, message_field, value):
-        """Set a slot field to the given value.
-        """
-        self.send_message(msg=Message.OKSETSLOT, slot_id=slot_number, message_field=message_field, payload=value)
+        """Set a slot field to the given value."""
+        self.send_message(msg=Message.OKSETSLOT, slot_id=slot_number, message_field=message_field, payload=value, from_ascii=True)
         # Set U2F
         # [255, 255, 255, 255, 230, 12, 8, 117, 50, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
         print(self.read_string())
@@ -449,6 +438,22 @@ def wipeslot(self, slot_number):
         for _ in range(8):
             print(self.read_string())
 
+    def setkey(self, slot_number, ecc_type, value):
+        # slot 131-132 Reserved
+        # slot 129-130 HMAC Keys
+        # slot 101-116 ECC Keys
+        # slot 1-4 RSA Keys
+        logging.debug('SETTING KEY IN SLOT:', slot_number)
+        logging.debug('TO TYPE:', ecc_type)
+        logging.debug('KEY:', value)
+        self.send_large_message3(msg=Message.OKSETPRIV, slot_id=slot_number, key_type=ecc_type, payload=value)
+        print(self.read_string())
+
+    def wipekey(self, slot_number):
+        logging.debug('WIPING KEY IN SLOT:', slot_number)
+        self.send_large_message3(msg=Message.OKWIPEPRIV, slot_id=slot_number, key_type='00', payload='00')
+        print(self.read_string())
+
     def sign(self, SignatureHash):
         global slotnum
         print('Signature hash to send to OnlyKey= ', binascii.hexlify(SignatureHash))

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='onlykey',
-    version='1.2.0',
+    version='1.2.1',
     description='OnlyKey client and command-line tool',
     # long_description=long_description,
     url='https://github.com/trustcrypto/python-onlykey',