Change packet format

onlykey · onlykey · commit cef582d3a998 · 2017-01-30T22:15:44.000-05:00
diff --git a/onlykey/client.py b/onlykey/client.py
@@ -239,10 +239,7 @@ def send_large_message3(self, payload=None, msg=None, slot_id=101, key_type=1):
         for chunk in chunks:
             # print chunk
             # print [ord(c) for c in chunk]
-            current_payload = [slot_id, key_type, 255]  # 255 means that it's not the last payload
-            # If it's less than the max size, set explicitely the size
-            if len(chunk) < 56:
-                current_payload = [slot_id, key_type, len(chunk)]
+            current_payload = [slot_id, key_type]  
 
             # Append the actual payload
             if isinstance(chunk, list):
diff --git a/tests/ssh_auth_rsa_1024.py b/tests/ssh_auth_rsa_1024.py
@@ -75,7 +75,7 @@ def pack_long(n):
 # send the byte array to OnlyKey splitting into 56 bytes per packet
 q_and_p = pack_long(q) + pack_long(p)
 #
-ok.send_large_message3(msg=255, slot_id=1, key_type=64+1, payload=q_and_p)
+ok.send_large_message3(msg=Message.OKSETPRIV, slot_id=1, key_type=64+1, payload=q_and_p)
 
 # ok.set_rsa_key(1, (1+64), byte array here) #Can only send 56 bytes per packet
 # Slot 1 - 4 for RSA
@@ -98,7 +98,7 @@ def pack_long(n):
 time.sleep(1.5)
 for _ in xrange(10):
     ok_pubkey = ok.read_bytes((1*128), to_str=True)
-    if len(ok_pubkey) == (rsatype*128):
+    if len(ok_pubkey) == (1*128):
         break
     time.sleep(1)
 
