[capture] Switch data generator format

The new uJSOn based communication interfaces requires that the crypto material is handed over in plain. Conversion from plain data to bytes now happens directly before sending data over simpleserial. This PR changes the data format from bytes to plain in the data generator. Signed-off-by: Pascal Nasahl <[email protected]>
lowRISC · Dec 4, 2023 · b0ab33a · b0ab33a
1 parent f924455
commit b0ab33a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 29 deletions.
diff --git a/capture/configs/aes_sca_cw310.yaml b/capture/configs/aes_sca_cw310.yaml
@@ -2,7 +2,8 @@ target:
   target_type: cw310
   fpga_bitstream: "../objs/lowrisc_systems_chip_earlgrey_cw310_0.1.bit"
   force_program_bitstream: False
-  fw_bin: "../objs/firmware.bin"
+  fw_bin: "../objs/aes_serial_fpga_cw310.bin"
+  # fw_bin: "../objs/aes_ujson_fpga_cw310.bin"
   # target_clk_mult is a hardcoded value in the bitstream. Do not change.
   target_clk_mult: 0.24
   target_freq: 24000000

diff --git a/objs/aes_ujson_fpga_cw310.bin b/objs/aes_ujson_fpga_cw310.bin
diff --git a/util/data_generator.py b/util/data_generator.py
@@ -9,54 +9,54 @@
 
 class data_generator():
 
-    key_generation = bytearray([0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF1,
-                                0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xE0, 0xF0])
-
-    text_fixed = bytearray([0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-                            0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA])
-    text_random = bytearray([0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
-                             0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC])
-    key_fixed = bytearray([0x81, 0x1E, 0x37, 0x31, 0xB0, 0x12, 0x0A, 0x78,
-                           0x42, 0x78, 0x1E, 0x22, 0xB2, 0x5C, 0xDD, 0xF9])
-    key_random = bytearray([0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53,
-                            0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53])
+    key_generation = [0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF1, 0x23,
+                      0x45, 0x67, 0x89, 0xAB, 0xCD, 0xE0, 0xF0]
+
+    text_fixed = [0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+                  0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA]
+    text_random = [0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
+                   0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC]
+    key_fixed = [0x81, 0x1E, 0x37, 0x31, 0xB0, 0x12, 0x0A, 0x78, 0x42, 0x78,
+                 0x1E, 0x22, 0xB2, 0x5C, 0xDD, 0xF9]
+    key_random = [0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53,
+                  0x53, 0x53, 0x53, 0x53, 0x53, 0x53]
 
     cipher_gen = AES.new(bytes(key_generation), AES.MODE_ECB)
 
     def __init__(self):
         self.cipher_gen = AES.new(bytes(self.key_generation), AES.MODE_ECB)
 
     def set_start(self):
-        self.text_fixed = bytearray([0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-                                     0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA])
-        self.text_random = bytearray([0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
-                                      0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC])
-        self.key_fixed = bytearray([0x81, 0x1E, 0x37, 0x31, 0xB0, 0x12, 0x0A, 0x78,
-                                    0x42, 0x78, 0x1E, 0x22, 0xB2, 0x5C, 0xDD, 0xF9])
-        self.key_random = bytearray([0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53,
-                                     0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53])
+        self.text_fixed = [0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+                           0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA]
+        self.text_random = [0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
+                            0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC]
+        self.key_fixed = [0x81, 0x1E, 0x37, 0x31, 0xB0, 0x12, 0x0A, 0x78, 0x42,
+                          0x78, 0x1E, 0x22, 0xB2, 0x5C, 0xDD, 0xF9]
+        self.key_random = [0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53,
+                           0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53]
 
     def advance_fixed(self):
-        self.text_fixed = bytearray(self.cipher_gen.encrypt(self.text_fixed))
+        self.text_fixed = self.cipher_gen.encrypt(bytes(self.text_fixed))
 
     def advance_random(self):
-        self.text_random = bytearray(self.cipher_gen.encrypt(self.text_random))
-        self.key_random = bytearray(self.cipher_gen.encrypt(self.key_random))
+        self.text_random = self.cipher_gen.encrypt(bytes(self.text_random))
+        self.key_random = self.cipher_gen.encrypt(bytes(self.key_random))
 
     def get_fixed(self):
-        pt = np.asarray(self.text_fixed)
-        key = np.asarray(self.key_fixed)
+        pt = self.text_fixed
+        key = self.key_fixed
         cipher_fixed = AES.new(bytes(self.key_fixed), AES.MODE_ECB)
-        ct = np.asarray(bytearray(cipher_fixed.encrypt(self.text_fixed)))
+        ct = cipher_fixed.encrypt(bytes(self.text_fixed))
         del (cipher_fixed)
         self.advance_fixed()
         return pt, ct, key
 
     def get_random(self):
-        pt = np.asarray(self.text_random)
-        key = np.asarray(self.key_random)
+        pt = self.text_random
+        key = self.key_random
         cipher_random = AES.new(bytes(self.key_random), AES.MODE_ECB)
-        ct = np.asarray(bytearray(cipher_random.encrypt(self.text_random)))
+        ct = cipher_random.encrypt(bytes(self.text_random))
         del (cipher_random)
         self.advance_random()
         return pt, ct, key