Skip to content

Commit 8e9aed0

Browse files
fix: resolve CI failures in ruff, CodeQL, and dependency-review
- Remove unused imports flagged by ruff (F401) across source and tests - Split semicolon-joined statements (E702) in registers.py and tests - Update dependency-review-action to v4.9.0 (old SHA was unreachable) - Add actions:read permission to CodeQL workflow for SARIF upload
1 parent cbf2f8f commit 8e9aed0

8 files changed

Lines changed: 14 additions & 18 deletions

File tree

.github/workflows/codeql.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
permissions:
1010
security-events: write
1111
contents: read
12+
actions: read
1213

1314
jobs:
1415
analyze:

.github/workflows/dependency-review.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1515

16-
- uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9
16+
- uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48
1717
with:
1818
fail-on-severity: moderate

src/cvm_measure/tdx/baseline.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,10 @@
4545
EV_EFI_PLATFORM_FIRMWARE_BLOB2,
4646
EV_EFI_VARIABLE_BOOT,
4747
EV_EFI_VARIABLE_DRIVER_CONFIG,
48-
EV_IPL,
4948
EV_PLATFORM_CONFIG_FLAGS,
5049
EV_SEPARATOR,
5150
TPM_ALG_SHA384,
5251
EventLogEntry,
53-
ParsedEventLog,
5452
parse_event_log,
5553
)
5654

src/cvm_measure/tdx/registers.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,17 @@ def _compute_rtmr0(firmware: bytes, baseline: Baseline) -> str:
143143
digests: list[bytes] = []
144144
bi = 0
145145

146-
digests.append(bytes.fromhex(baseline_events[bi].digest)); bi += 1
146+
digests.append(bytes.fromhex(baseline_events[bi].digest))
147+
bi += 1
147148
digests.append(cfv_digest)
148149
digests.append(sb_flag_digest)
149150
for _ in range(4):
150-
digests.append(bytes.fromhex(baseline_events[bi].digest)); bi += 1
151+
digests.append(bytes.fromhex(baseline_events[bi].digest))
152+
bi += 1
151153
digests.append(SEPARATOR_DIGEST)
152154
while bi < len(baseline_events):
153-
digests.append(bytes.fromhex(baseline_events[bi].digest)); bi += 1
155+
digests.append(bytes.fromhex(baseline_events[bi].digest))
156+
bi += 1
154157

155158
return replay_digests(digests).hex()
156159

tests/test_cli.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
from __future__ import annotations
1818

1919
import json
20-
from pathlib import Path
21-
from unittest.mock import patch
2220

2321
import pytest
2422

tests/test_registers.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import hashlib
2020
import struct
2121

22-
import pytest
23-
2422
from cvm_measure.tdx.registers import (
2523
EFI_ACTION_DIGESTS,
2624
SEPARATOR_DIGEST,
@@ -82,14 +80,17 @@ def test_rtmr0_matches_golden(self, baseline_a3, golden_a3, ccel_data_a3) -> Non
8280

8381
digests = []
8482
bi = 0
85-
digests.append(bytes.fromhex(baseline_events[bi].digest)); bi += 1
83+
digests.append(bytes.fromhex(baseline_events[bi].digest))
84+
bi += 1
8685
digests.append(cfv_event)
8786
digests.append(compute_secureboot_digest("SecureBoot", sb_flag_data))
8887
for _ in range(4):
89-
digests.append(bytes.fromhex(baseline_events[bi].digest)); bi += 1
88+
digests.append(bytes.fromhex(baseline_events[bi].digest))
89+
bi += 1
9090
digests.append(SEPARATOR_DIGEST)
9191
while bi < len(baseline_events):
92-
digests.append(bytes.fromhex(baseline_events[bi].digest)); bi += 1
92+
digests.append(bytes.fromhex(baseline_events[bi].digest))
93+
bi += 1
9394

9495
rtmr0 = replay_digests(digests).hex()
9596
assert rtmr0 == golden_a3.rtmr0

tests/test_rtmr.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
from __future__ import annotations
1818

1919
import hashlib
20-
import struct
21-
22-
import pytest
2320

2421
from cvm_measure.tdx.rtmr import SHA384_SIZE, extend_rtmr, replay_digests
2522

tests/test_uefi.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
from __future__ import annotations
1818

19-
import hashlib
20-
2119
from cvm_measure.tdx.uefi import (
2220
build_uefi_variable_data,
2321
compute_secureboot_digest,

0 commit comments

Comments
 (0)