Merge branch 'main' into cpa

google · Feb 4, 2025 · ad055bc · ad055bc
2 parents a3e673b + 628e8fc
commit ad055bc
Show file tree

Hide file tree

Showing 3 changed files with 699 additions and 1,642 deletions.
diff --git a/scaaml/capture/aes/capture_runner.py b/scaaml/capture/aes/capture_runner.py
@@ -20,7 +20,6 @@
 
 import chipwhisperer as cw
 from chipwhisperer.common.traces import Trace
-from chipwhisperer.common.utils import util as cw_util
 
 from scaaml.capture.capture_runner import AbstractCaptureRunner
 from scaaml.capture.crypto_input import AbstractCryptoInput
@@ -58,9 +57,10 @@ def capture_trace(self, crypto_input: CryptoInput) -> Optional[Trace]:
           AssertionError: If the textin in the trace is different from
             plaintext.
         """
-        # Convert to cw bytearray, which has nicer __str__ and __repr__.
-        plaintext = cw_util.bytearray(crypto_input.plaintext)
-        key = cw_util.bytearray(crypto_input.key)
+        # Convert to cw bytearray, which has nicer __str__ and __repr__ (helps
+        # to comply with type-checking).
+        plaintext = cw.bytearray(crypto_input.plaintext)
+        key = cw.bytearray(crypto_input.key)
 
         # Get the scope object.
         scope = self._scope.scope
@@ -76,7 +76,8 @@ def capture_trace(self, crypto_input: CryptoInput) -> Optional[Trace]:
             scope=scope,  # type: ignore[arg-type]
             target=target,
             plaintext=plaintext,
-            key=key)
+            key=key,
+        )
 
         return trace