Skip to content

Commit e1bc149

Browse files
authored
Merge branch 'master' into fix/917_ncp_init
2 parents 2c962c0 + 17ad72e commit e1bc149

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

.github/workflows/restyled.yml

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ jobs:
1515
uses: actions/checkout@v4
1616

1717
- uses: restyled-io/actions/setup@v4
18+
with:
19+
# Pin the Restyler version to v0.6.0.2
20+
tag: 'v0.6.0.2'
21+
1822
- id: restyler
1923
uses: restyled-io/actions/run@v4
2024
with:

credentials/generate_revocation_set.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,13 @@ def generate_revocation_set_from_crl(crl_file: x509.CertificateRevocationList,
240240
except Exception:
241241
pass
242242

243-
serialnumber_list.append(bytes(str('{:02X}'.format(revoked_cert.serial_number)), 'utf-8').decode('utf-8'))
243+
# Ensure the serial number is always a 2-byte aligned hex string.
244+
# TestDACRevocationDelegateImpl encodes the serial number as an even-length hex string
245+
# using BytesToHex in src/lib/support/BytesToHex.cpp.
246+
# As the primary consumer of this data, we should use the same here.
247+
serialnumber = '{:02X}'.format(revoked_cert.serial_number)
248+
serialnumber = serialnumber if len(serialnumber) % 2 == 0 else '0' + serialnumber
249+
serialnumber_list.append(serialnumber)
244250

245251
entry = {
246252
"type": "revocation_set",

credentials/test/revoked-attestation-certificates/revocation-sets/revocation-set-for-pai.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"issuer_subject_key_id": "63540E47F64B1C38D13884A462D16C195D8FFB3C",
55
"issuer_name": "MD0xJTAjBgNVBAMMHE1hdHRlciBEZXYgUEFJIDB4RkZGMSBubyBQSUQxFDASBgorBgEEAYKifAIBDARGRkYx",
66
"revoked_serial_numbers": [
7-
"AB042494323FE54",
7+
"0AB042494323FE54",
88
"19367D978EAC533A",
99
"2569383D24BB36EA"
1010
],

0 commit comments

Comments
 (0)