GHA: Fix black & flake8 issues and add clang-format stage

.github/workflows/lint.yml

@@ -2,7 +2,7 @@ name: lint
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ "**" ]
   push:
     branches: [ master ]
 
@@ -30,3 +30,11 @@ jobs:
       - run: |
           black --version
           black --check --diff .
+  clang-format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: sudo apt-get install clang-format
+      - run: |
+          clang-format -style="{IndentWidth: 4}" --dry-run --Werror -i *.cpp *.H
+        working-directory: pintool

analysis/analyze.py

@@ -392,7 +392,7 @@ def read_and_advance(chunk, idx, format_type, length):
         # This parsing requires a naming scheme like: `key1.key`
         key_index = int(set(keys).pop().replace("key", "").replace(".", ""))
 
-    for (trace_file, key_file) in zip(files, keys):
+    for trace_file, key_file in zip(files, keys):
         with open(trace_file, "rb") as tf, open(key_file, "rb") as kf:
             trace = tf.read()
             key = kf.read()
@@ -508,7 +508,7 @@ def _glt_sort_and_map(mapping_table, data):
     # Sort data from big to little wrt to the counts
     data = sorted(data.items(), key=lambda kv: kv[1], reverse=True)
     # Map addr to new value
-    for (address, count) in data:
+    for address, count in data:
         if address not in mapping_table:
             mapping_table[address] = len(mapping_table.keys())
         tmp_data[mapping_table[address]] = count
@@ -612,7 +612,7 @@ def generic_leakage_test(fixed, random):
     # iterate over leaks
     debug(0, "Got %d trace differences.", (len(fixedleaks)))
     sys.stdout.flush()
-    for (idx, (fl, rl)) in enumerate(zip(fixedleaks, randomleaks)):
+    for idx, (fl, rl) in enumerate(zip(fixedleaks, randomleaks)):
         msg = {"warning": "", "leak": ""}
         assert fl.ip == rl.ip
 

analysis/datastub/leaks.py

@@ -492,12 +492,12 @@ def is_specific_leak(self):
     def max_leak(self):
         max_leak = None
         if self.is_generic_leak():
-            max_leak_ns = max(self.nsleak, key=lambda l: l.normalized())
+            max_leak_ns = max(self.nsleak, key=lambda leak: leak.normalized())
             # Remove M_pos, as it does not work properly
             # normalized = max(normalized, max(self.nsleak, key=lambda l: 0 if l.nstype == NSPType.Type3 else l.normalized()).normalized())
             max_leak = max_leak_ns
         if self.is_specific_leak():
-            max_leak_sp = max(self.spleak, key=lambda l: l.normalized())
+            max_leak_sp = max(self.spleak, key=lambda leak: leak.normalized())
             # Remove M_pos, as it does not work properly
             # normalized = max(normalized, max(self.spleak, key=lambda l: 0 if l.sptype == NSPType.Type3 else l.normalized()).normalized())
             max_leak = max_leak_sp if max_leak_sp.normalized() > max_leak.normalized() else max_leak

analysis/datastub/printer.py

@@ -193,10 +193,10 @@ def doprint_generic(self, obj, param1=False):
 
                 key_indxs = [e.key.index for e in obj.evidence]
                 evidences = [[] for _ in range(max(key_indxs) + 1)]
-                for (idx, key_indx) in enumerate(key_indxs):
+                for idx, key_indx in enumerate(key_indxs):
                     evidences[key_indx].append(obj.evidence[idx])
 
-                for (idx, evidence) in enumerate(evidences):
+                for idx, evidence in enumerate(evidences):
                     entries = Counter(
                         [entry for ee in evidence for entry in ee.entries]
                     )
@@ -209,7 +209,7 @@ def doprint_generic(self, obj, param1=False):
                     else:
                         node = f"{node_plain} origin='fixed' {str(evidence[0].key)}"
                     self.startNode(node)
-                    for (key, value) in entries.items():
+                    for key, value in entries.items():
                         self.doprint_line(f"{format(key, 'x')}: {value}")
                     self.endNode(node_plain)
 

analysis/leakage_models/dsa_nonce.py

@@ -49,7 +49,7 @@ def input_to_lines(input):
     num_lines_per_input = len(input_to_lines(inputs[0]))
     result = numpy.ndarray((len(inputs), num_lines_per_input), dtype=numpy.int)
 
-    for (i, input) in enumerate(inputs):
+    for i, input in enumerate(inputs):
         result[i][:] = [v for k, v in input_to_lines(input)]
 
     return (result, labels)