Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

da_revocation: align the revocation set generation algorithm with spec changes #36225

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

shubhamdp
Copy link
Contributor

There has been some updates to the revocation set generation algorithm in https://github.com/CHIP-Specifications/connectedhomeip-spec/issues/10308.

Add some helper function to interact with certificates.

Tests

Locally tested

python3 generate-revocation-set.py --use-main-net-http --log-level debug
python3 generate-revocation-set.py --use-test-net-http --log-level debug

Copy link

semanticdiff-com bot commented Oct 24, 2024

Review changes with SemanticDiff.

Analyzed 1 of 1 files.

Overall, the semantic diff is 18% smaller than the GitHub diff.

Filename Status
✔️ credentials/generate-revocation-set.py 17.33% smaller

Copy link

github-actions bot commented Oct 24, 2024

PR #36225: Size comparison from 75d7e6b to 7b138c4

Full report (44 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, nrfconnect, psoc6, qpg, stm32, telink, tizen)
platform target config section 75d7e6b 7b138c4 change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1350048 1350048 0 0.0
RAM 104120 104120 0 0.0
bl702 lighting-app bl702+eth FLASH 647684 647684 0 0.0
RAM 25233 25233 0 0.0
bl702+wifi FLASH 825248 825248 0 0.0
RAM 13965 13965 0 0.0
bl706+mfd+rpc+littlefs FLASH 1054238 1054238 0 0.0
RAM 23821 23821 0 0.0
bl702l lighting-app bl702l+mfd+littlefs FLASH 975022 975022 0 0.0
RAM 16468 16468 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 829548 829548 0 0.0
RAM 123452 123452 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 814856 814856 0 0.0
RAM 125332 125332 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 761444 761444 0 0.0
RAM 113824 113824 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 745688 745688 0 0.0
RAM 114016 114016 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 617226 617226 0 0.0
RAM 205908 205908 0 0.0
lock CC3235SF_LAUNCHXL FLASH 657194 657194 0 0.0
RAM 206060 206060 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 678629 678629 0 0.0
RAM 78692 78692 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 698473 698473 0 0.0
RAM 81324 81324 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 698473 698473 0 0.0
RAM 81324 81324 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 655409 655409 0 0.0
RAM 73760 73760 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 615045 615045 0 0.0
RAM 71644 71644 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 634673 634673 0 0.0
RAM 74196 74196 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 634673 634673 0 0.0
RAM 74196 74196 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 634317 634317 0 0.0
RAM 74692 74692 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 654033 654033 0 0.0
RAM 77244 77244 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 654033 654033 0 0.0
RAM 77244 77244 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 609693 609693 0 0.0
RAM 68780 68780 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 629553 629553 0 0.0
RAM 71412 71412 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 629553 629553 0 0.0
RAM 71412 71412 0 0.0
efr32 lock-app BRD4187C FLASH 925644 925644 0 0.0
RAM 159920 159920 0 0.0
BRD4338a FLASH 742216 742216 0 0.0
RAM 232580 232580 0 0.0
window-app BRD4187C FLASH 1018568 1018568 0 0.0
RAM 128264 128264 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 915564 915564 0 0.0
RAM 143357 143357 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 886048 886048 0 0.0
RAM 141496 141496 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 848972 848972 0 0.0
RAM 142265 142265 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1647652 1647652 0 0.0
RAM 212408 212408 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1553724 1553724 0 0.0
RAM 209208 209208 0 0.0
light cy8ckit_062s2_43012 FLASH 1467988 1467988 0 0.0
RAM 201200 201200 0 0.0
lock cy8ckit_062s2_43012 FLASH 1464964 1464964 0 0.0
RAM 225560 225560 0 0.0
qpg lighting-app qpg6105+debug FLASH 660544 660544 0 0.0
RAM 105420 105420 0 0.0
lock-app qpg6105+debug FLASH 618620 618620 0 0.0
RAM 99880 99880 0 0.0
stm32 light STM32WB5MM-DK FLASH 481920 481920 0 0.0
RAM 144844 144844 0 0.0
telink bridge-app tlsr9258a FLASH 681138 681138 0 0.0
RAM 91304 91304 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 620788 620788 0 0.0
RAM 50600 50600 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 708768 708768 0 0.0
RAM 73940 73940 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 625738 625738 0 0.0
RAM 144468 144468 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 811748 811748 0 0.0
RAM 99100 99100 0 0.0
tizen all-clusters-app arm unknown 4912 4912 0 0.0
FLASH 1729948 1729948 0 0.0
RAM 90108 90108 0 0.0
chip-tool-ubsan arm unknown 10792 10792 0 0.0
FLASH 18237374 18237374 0 0.0
RAM 7946324 7946324 0 0.0

Copy link

github-actions bot commented Oct 24, 2024

PR #36225: Size comparison from 75d7e6b to c4a854b

Full report (68 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 75d7e6b c4a854b change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1350048 1350048 0 0.0
RAM 104120 104120 0 0.0
bl702 lighting-app bl702+eth FLASH 647684 647684 0 0.0
RAM 25233 25233 0 0.0
bl702+wifi FLASH 825248 825248 0 0.0
RAM 13965 13965 0 0.0
bl706+mfd+rpc+littlefs FLASH 1054238 1054238 0 0.0
RAM 23821 23821 0 0.0
bl702l lighting-app bl702l+mfd+littlefs FLASH 975022 975022 0 0.0
RAM 16468 16468 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 829548 829548 0 0.0
RAM 123452 123452 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 814856 814856 0 0.0
RAM 125332 125332 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 761444 761444 0 0.0
RAM 113824 113824 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 745688 745688 0 0.0
RAM 114016 114016 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 617226 617226 0 0.0
RAM 205908 205908 0 0.0
lock CC3235SF_LAUNCHXL FLASH 657194 657194 0 0.0
RAM 206060 206060 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 678629 678629 0 0.0
RAM 78692 78692 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 698473 698473 0 0.0
RAM 81324 81324 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 698473 698473 0 0.0
RAM 81324 81324 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 655409 655409 0 0.0
RAM 73760 73760 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 615045 615045 0 0.0
RAM 71644 71644 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 634673 634673 0 0.0
RAM 74196 74196 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 634673 634673 0 0.0
RAM 74196 74196 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 634317 634317 0 0.0
RAM 74692 74692 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 654033 654033 0 0.0
RAM 77244 77244 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 654033 654033 0 0.0
RAM 77244 77244 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 609693 609693 0 0.0
RAM 68780 68780 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 629553 629553 0 0.0
RAM 71412 71412 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 629553 629553 0 0.0
RAM 71412 71412 0 0.0
efr32 lock-app BRD4187C FLASH 925644 925644 0 0.0
RAM 159920 159920 0 0.0
BRD4338a FLASH 742216 742216 0 0.0
RAM 232580 232580 0 0.0
window-app BRD4187C FLASH 1018568 1018568 0 0.0
RAM 128264 128264 0 0.0
esp32 all-clusters-app c3devkit DRAM 95256 95256 0 0.0
FLASH 1540020 1540020 0 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 116192 116192 0 0.0
FLASH 1550198 1550198 0 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4688 4688 0 0.0
FLASH 2781357 2781357 0 0.0
RAM 129520 129520 0 0.0
all-clusters-app debug unknown 5528 5528 0 0.0
FLASH 6092442 6092442 0 0.0
RAM 523840 523840 0 0.0
all-clusters-minimal-app debug unknown 5424 5424 0 0.0
FLASH 5423026 5423026 0 0.0
RAM 242416 242416 0 0.0
bridge-app debug unknown 5408 5408 0 0.0
FLASH 4751606 4751606 0 0.0
RAM 218384 218384 0 0.0
chip-tool debug unknown 5960 5960 0 0.0
FLASH 13096042 13096042 0 0.0
RAM 584402 584402 0 0.0
chip-tool-ipv6only arm64 unknown 21408 21408 0 0.0
FLASH 11199624 11199624 0 0.0
RAM 635344 635344 0 0.0
fabric-admin debug unknown 5792 5792 0 0.0
FLASH 11355025 11355025 0 0.0
RAM 584890 584890 0 0.0
fabric-bridge-app debug unknown 4632 4632 0 0.0
FLASH 4578190 4578190 0 0.0
RAM 205336 205336 0 0.0
fabric-sync debug unknown 4816 4816 0 0.0
FLASH 5290421 5290421 0 0.0
RAM 465416 465416 0 0.0
lighting-app debug+rpc+ui unknown 6056 6056 0 0.0
FLASH 5693777 5693777 0 0.0
RAM 228488 228488 0 0.0
lock-app debug unknown 5344 5344 0 0.0
FLASH 4801184 4801184 0 0.0
RAM 204472 204472 0 0.0
ota-provider-app debug unknown 4720 4720 0 0.0
FLASH 4430454 4430454 0 0.0
RAM 198192 198192 0 0.0
ota-requestor-app debug unknown 4656 4656 0 0.0
FLASH 4569226 4569226 0 0.0
RAM 202760 202760 0 0.0
shell debug unknown 4216 4216 0 0.0
FLASH 3115981 3115981 0 0.0
RAM 160368 160368 0 0.0
thermostat-no-ble arm64 unknown 9448 9448 0 0.0
FLASH 4163480 4163480 0 0.0
RAM 242896 242896 0 0.0
tv-app debug unknown 5624 5624 0 0.0
FLASH 6032501 6032501 0 0.0
RAM 596256 596256 0 0.0
tv-casting-app debug unknown 5208 5208 0 0.0
FLASH 11300541 11300541 0 0.0
RAM 694536 694536 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 915564 915564 0 0.0
RAM 143357 143357 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 886048 886048 0 0.0
RAM 141496 141496 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 848972 848972 0 0.0
RAM 142265 142265 0 0.0
nxp contact k32w0+release FLASH 582424 582424 0 0.0
RAM 71092 71092 0 0.0
mcxw71+release FLASH 596912 596912 0 0.0
RAM 63184 63184 0 0.0
light k32w0+release FLASH 619044 619044 0 0.0
RAM 70556 70556 0 0.0
k32w1+release FLASH 683144 683144 0 0.0
RAM 48816 48816 0 0.0
lock mcxw71+release FLASH 746696 746696 0 0.0
RAM 67340 67340 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1647652 1647652 0 0.0
RAM 212408 212408 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1553724 1553724 0 0.0
RAM 209208 209208 0 0.0
light cy8ckit_062s2_43012 FLASH 1467988 1467988 0 0.0
RAM 201200 201200 0 0.0
lock cy8ckit_062s2_43012 FLASH 1464964 1464964 0 0.0
RAM 225560 225560 0 0.0
qpg lighting-app qpg6105+debug FLASH 660544 660544 0 0.0
RAM 105420 105420 0 0.0
lock-app qpg6105+debug FLASH 618620 618620 0 0.0
RAM 99880 99880 0 0.0
stm32 light STM32WB5MM-DK FLASH 481920 481920 0 0.0
RAM 144844 144844 0 0.0
telink bridge-app tlsr9258a FLASH 681138 681138 0 0.0
RAM 91304 91304 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 620788 620788 0 0.0
RAM 50600 50600 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 708768 708768 0 0.0
RAM 73940 73940 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 625738 625738 0 0.0
RAM 144468 144468 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 811748 811748 0 0.0
RAM 99100 99100 0 0.0
tizen all-clusters-app arm unknown 4912 4912 0 0.0
FLASH 1729948 1729948 0 0.0
RAM 90108 90108 0 0.0
chip-tool-ubsan arm unknown 10792 10792 0 0.0
FLASH 18237374 18237374 0 0.0
RAM 7946324 7946324 0 0.0

@@ -91,6 +91,101 @@ def parse_vid_pid_from_distinguished_name(distinguished_name):
return vid, pid


def get_akid(cert: x509.Certificate) -> bytes:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you are catching the exception, the bytes output should be optional here.

Comment on lines +494 to +496
# No point in creating an entry which has no revoked serial numbers
if len(serialnumber_list) == 0:
continue
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's generate 1 set for each, even if empty.

# will raise an exception if signature is invalid
try:
root.public_key().verify(cert.signature, cert.tbs_certificate_bytes, ec.ECDSA(cert.signature_hash_algorithm))
except Exception:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is too wide of an exception. Please catch the exception that the verification fails with.

@@ -91,6 +91,101 @@ def parse_vid_pid_from_distinguished_name(distinguished_name):
return vid, pid


def get_akid(cert: x509.Certificate) -> bytes:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-> Optional[bytes]`

Requires from typing import Optional

try:
return cert.extensions.get_extension_for_oid(x509.OID_SUBJECT_KEY_IDENTIFIER).value.key_identifier
except Exception:
return None
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please log in all exceptions what happened to help assist debugging.

return None


def get_skid(cert: x509.Certificate) -> bytes:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, missing optional.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants