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.

Sign up for GitHub

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

Jump to bottom

Added CanCastTo() Macros in the OpenSSL Crypto Library Implementation. #18161

Merged
merged 2 commits into from
May 7, 2022
Merged

Added CanCastTo() Macros in the OpenSSL Crypto Library Implementation. #18161

merged 2 commits into from
May 7, 2022

Conversation

emargolis
Copy link
Contributor

Problem

Some safe-cast checks are missing in the OpenSSL implementation of crypto libraries.

Also the i2d_X509_REQ() function can overwrite output buffer if it is too small.

Change overview

Fixed and added checks.

Testing

all existing tests

@boring-cyborg boring-cyborg bot added the crypto label May 6, 2022
@github-actions
Copy link

github-actions bot commented May 6, 2022 •
edited
Loading

PR #18161: Size comparison from 70dc49f to b0f7e53

Full report (15 builds for cc13x2_26x2, cyw30739, k32w, linux, mbed, nrfconnect, telink)
platform target config section 70dc49f b0f7e53 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 690935 690935 0 0.0
(read/write) 161416 161416 0 0.0
.bss 75332 75332 0 0.0
.data 3412 3412 0 0.0
.rodata 102983 102983 0 0.0
.text 587468 587468 0 0.0
lock-ftd LP_CC2652R7 (read only) 678507 678507 0 0.0
(read/write) 164948 164948 0 0.0
.bss 73492 73492 0 0.0
.data 3236 3236 0 0.0
.rodata 94771 94771 0 0.0
.text 583256 583256 0 0.0
lock-mtd LP_CC2652R7 (read only) 627259 627259 0 0.0
(read/write) 146308 146308 0 0.0
.bss 69212 69212 0 0.0
.data 3236 3236 0 0.0
.rodata 94651 94651 0 0.0
.text 532120 532120 0 0.0
pump-app LP_CC2652R7 (read only) 663035 663035 0 0.0
(read/write) 181708 181708 0 0.0
.bss 73756 73756 0 0.0
.data 3268 3268 0 0.0
.rodata 80971 80971 0 0.0
.text 581580 581580 0 0.0
pump-controller-app LP_CC2652R7 (read only) 655943 655943 0 0.0
(read/write) 188600 188600 0 0.0
.bss 73812 73812 0 0.0
.data 3232 3232 0 0.0
.rodata 83911 83911 0 0.0
.text 571548 571548 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 627586 627586 0 0.0
.app_xip_area 530176 530176 0 0.0
.bss 80052 80052 0 0.0
.data 708 708 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 626474 626474 0 0.0
.app_xip_area 530520 530520 0 0.0
.bss 78628 78628 0 0.0
.data 672 672 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 575234 575234 0 0.0
.app_xip_area 469564 469564 0 0.0
.bss 88048 88048 0 0.0
.data 584 584 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
k32w light k32w061+release (read/write) 685136 685136 0 0.0
.bss 81248 81248 0 0.0
.data 2020 2020 0 0.0
.text 600164 600164 0 0.0
lock k32w061+release (read/write) 730468 730468 0 0.0
.bss 81680 81680 0 0.0
.data 1980 1980 0 0.0
.text 645104 645104 0 0.0
linux chip-tool-no-interactive-ipv6only arm64 (read only) 8856532 8856532 0 0.0
(read/write) 643137 643137 0 0.0
.bss 41105 41105 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 582048 582048 0 0.0
.dynamic 560 560 0 0.0
.got 14976 14976 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 433636 433636 0 0.0
.text 6963588 6963588 0 0.0
thermostat-no-ble arm64 (read only) 2368620 2368620 0 0.0
(read/write) 175121 175121 0 0.0
.bss 86417 86417 0 0.0
.data 1520 1520 0 0.0
.data.rel.ro 79376 79376 0 0.0
.dynamic 560 560 0 0.0
.got 4768 4768 0 0.0
.init 24 24 0 0.0
.init_array 376 376 0 0.0
.rodata 146844 146844 0 0.0
.text 1992032 1992032 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2420084 2420084 0 0.0
.bss 205820 205820 0 0.0
.data 5872 5872 0 0.0
.text 1382684 1382684 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1179787 1179787 0 0.0
bss 139680 139680 0 0.0
rodata 151532 151532 0 0.0
text 809856 809856 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 806024 806024 0 0.0
bss 72176 72176 0 0.0
noinit 40416 40416 0 0.0
text 572426 572426 0 0.0

@github-actions
Copy link

github-actions bot commented May 6, 2022 •
edited
Loading

PR #18161: Size comparison from 70dc49f to 5846cc5

Increases (9 builds for linux)
platform target config section 70dc49f 5846cc5 change % change
linux all-clusters-app debug (read only) 2740073 2740441 368 0.0
.text 2328514 2328882 368 0.0
bridge-app debug+rpc (read only) 1894161 1894545 384 0.0
.text 1609714 1610098 384 0.0
chip-tool debug (read only) 9026661 9027525 864 0.0
.text 7236709 7237573 864 0.0
lighting-app debug+rpc (read only) 2328241 2328625 384 0.0
.text 1975810 1976194 384 0.0
lock-app debug (read only) 2235537 2235921 384 0.0
.text 1879714 1880098 384 0.0
ota-provider-app debug (read only) 2063865 2064249 384 0.0
.text 1729506 1729890 384 0.0
ota-requestor-app debug (read only) 2095041 2095409 368 0.0
.text 1762866 1763234 368 0.0
shell debug (read only) 2565049 2565417 368 0.0
.text 2185138 2185506 368 0.0
tv-app debug (read only) 2850849 2851793 944 0.0
.text 2449762 2450706 944 0.0
Full report (34 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 70dc49f 5846cc5 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 690935 690935 0 0.0
(read/write) 161416 161416 0 0.0
.bss 75332 75332 0 0.0
.data 3412 3412 0 0.0
.rodata 102983 102983 0 0.0
.text 587468 587468 0 0.0
lock-ftd LP_CC2652R7 (read only) 678507 678507 0 0.0
(read/write) 164948 164948 0 0.0
.bss 73492 73492 0 0.0
.data 3236 3236 0 0.0
.rodata 94771 94771 0 0.0
.text 583256 583256 0 0.0
lock-mtd LP_CC2652R7 (read only) 627259 627259 0 0.0
(read/write) 146308 146308 0 0.0
.bss 69212 69212 0 0.0
.data 3236 3236 0 0.0
.rodata 94651 94651 0 0.0
.text 532120 532120 0 0.0
pump-app LP_CC2652R7 (read only) 663035 663035 0 0.0
(read/write) 181708 181708 0 0.0
.bss 73756 73756 0 0.0
.data 3268 3268 0 0.0
.rodata 80971 80971 0 0.0
.text 581580 581580 0 0.0
pump-controller-app LP_CC2652R7 (read only) 655943 655943 0 0.0
(read/write) 188600 188600 0 0.0
.bss 73812 73812 0 0.0
.data 3232 3232 0 0.0
.rodata 83911 83911 0 0.0
.text 571548 571548 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 627586 627586 0 0.0
.app_xip_area 530176 530176 0 0.0
.bss 80052 80052 0 0.0
.data 708 708 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 626474 626474 0 0.0
.app_xip_area 530520 530520 0 0.0
.bss 78628 78628 0 0.0
.data 672 672 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 575234 575234 0 0.0
.app_xip_area 469564 469564 0 0.0
.bss 88048 88048 0 0.0
.data 584 584 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 910096 910096 0 0.0
(read/write) 134520 134520 0 0.0
.bss 132456 132456 0 0.0
.data 2064 2064 0 0.0
.text 910088 910088 0 0.0
BRD4161A+rpc (read only) 944440 944440 0 0.0
(read/write) 151208 151208 0 0.0
.bss 148936 148936 0 0.0
.data 2268 2268 0 0.0
.text 944432 944432 0 0.0
BRD4161A+rs911x (read only) 787676 787676 0 0.0
(read/write) 129776 129776 0 0.0
.bss 127708 127708 0 0.0
.data 2068 2068 0 0.0
.text 787668 787668 0 0.0
lock-app BRD4161A+wf200 (read only) 946768 946768 0 0.0
(read/write) 124268 124268 0 0.0
.bss 122244 122244 0 0.0
.data 2024 2024 0 0.0
.text 946760 946760 0 0.0
window-app BRD4161A (read only) 886516 886516 0 0.0
(read/write) 134460 134460 0 0.0
.bss 132408 132408 0 0.0
.data 2052 2052 0 0.0
.text 886508 886508 0 0.0
esp32 all-clusters-app c3devkit (read only) 1001090 1001090 0 0.0
(read/write) 1475658 1475658 0 0.0
.dram0.bss 68464 68464 0 0.0
.dram0.data 14444 14444 0 0.0
.flash.rodata 208304 208304 0 0.0
.flash.text 1001090 1001090 0 0.0
.iram0.text 62020 62020 0 0.0
m5stack (read only) 1056031 1056031 0 0.0
(read/write) 478088 478088 0 0.0
.dram0.bss 73984 73984 0 0.0
.dram0.data 34184 34184 0 0.0
.flash.rodata 238084 238084 0 0.0
.flash.text 1050647 1050647 0 0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 685136 685136 0 0.0
.bss 81248 81248 0 0.0
.data 2020 2020 0 0.0
.text 600164 600164 0 0.0
lock k32w061+release (read/write) 730468 730468 0 0.0
.bss 81680 81680 0 0.0
.data 1980 1980 0 0.0
.text 645104 645104 0 0.0
linux all-clusters-app debug (read only) 2740073 2740441 368 0.0
(read/write) 174264 174264 0 0.0
.bss 83680 83680 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 82392 82392 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 1008 1008 0 0.0
.rodata 236357 236357 0 0.0
.text 2328514 2328882 368 0.0
bridge-app debug+rpc (read only) 1894161 1894545 384 0.0
(read/write) 120984 120984 0 0.0
.bss 71520 71520 0 0.0
.data 3488 3488 0 0.0
.data.rel.ro 40648 40648 0 0.0
.dynamic 592 592 0 0.0
.got 4032 4032 0 0.0
.init 27 27 0 0.0
.init_array 688 688 0 0.0
.rodata 161593 161593 0 0.0
.text 1609714 1610098 384 0.0
chip-tool debug (read only) 9026661 9027525 864 0.0
(read/write) 576944 576944 0 0.0
.bss 22816 22816 0 0.0
.data 1136 1136 0 0.0
.data.rel.ro 546728 546728 0 0.0
.dynamic 624 624 0 0.0
.got 4952 4952 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 466133 466133 0 0.0
.text 7236709 7237573 864 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 8856532 8856532 0 0.0
(read/write) 643137 643137 0 0.0
.bss 41105 41105 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 582048 582048 0 0.0
.dynamic 560 560 0 0.0
.got 14976 14976 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 433636 433636 0 0.0
.text 6963588 6963588 0 0.0
lighting-app debug+rpc (read only) 2328241 2328625 384 0.0
(read/write) 151936 151936 0 0.0
.bss 73568 73568 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 70568 70568 0 0.0
.dynamic 608 608 0 0.0
.got 4320 4320 0 0.0
.init 27 27 0 0.0
.init_array 792 792 0 0.0
.rodata 185721 185721 0 0.0
.text 1975810 1976194 384 0.0
lock-app debug (read only) 2235537 2235921 384 0.0
(read/write) 146520 146520 0 0.0
.bss 72192 72192 0 0.0
.data 1568 1568 0 0.0
.data.rel.ro 67080 67080 0 0.0
.dynamic 592 592 0 0.0
.got 4312 4312 0 0.0
.init 27 27 0 0.0
.init_array 752 752 0 0.0
.rodata 195465 195465 0 0.0
.text 1879714 1880098 384 0.0
ota-provider-app debug (read only) 2063865 2064249 384 0.0
(read/write) 139632 139632 0 0.0
.bss 71680 71680 0 0.0
.data 1736 1736 0 0.0
.data.rel.ro 60440 60440 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 176467 176467 0 0.0
.text 1729506 1729890 384 0.0
ota-requestor-app debug (read only) 2095041 2095409 368 0.0
(read/write) 142440 142440 0 0.0
.bss 72320 72320 0 0.0
.data 1992 1992 0 0.0
.data.rel.ro 62504 62504 0 0.0
.dynamic 592 592 0 0.0
.got 4320 4320 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 172796 172796 0 0.0
.text 1762866 1763234 368 0.0
shell debug (read only) 2565049 2565417 368 0.0
(read/write) 198160 198160 0 0.0
.bss 114408 114408 0 0.0
.data 1376 1376 0 0.0
.data.rel.ro 76656 76656 0 0.0
.dynamic 592 592 0 0.0
.got 4184 4184 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 217810 217810 0 0.0
.text 2185138 2185506 368 0.0
thermostat-no-ble arm64 (read only) 2368620 2368620 0 0.0
(read/write) 175121 175121 0 0.0
.bss 86417 86417 0 0.0
.data 1520 1520 0 0.0
.data.rel.ro 79376 79376 0 0.0
.dynamic 560 560 0 0.0
.got 4768 4768 0 0.0
.init 24 24 0 0.0
.init_array 376 376 0 0.0
.rodata 146844 146844 0 0.0
.text 1992032 1992032 0 0.0
tv-app debug (read only) 2850849 2851793 944 0.0
(read/write) 277248 277248 0 0.0
.bss 189464 189464 0 0.0
.data 4672 4672 0 0.0
.data.rel.ro 76872 76872 0 0.0
.dynamic 592 592 0 0.0
.got 4696 4696 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 218411 218411 0 0.0
.text 2449762 2450706 944 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2420084 2420084 0 0.0
.bss 205820 205820 0 0.0
.data 5872 5872 0 0.0
.text 1382684 1382684 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1179787 1179787 0 0.0
bss 139680 139680 0 0.0
rodata 151532 151532 0 0.0
text 809856 809856 0 0.0
p6 all-clusters-app default (read/write) 2531536 2531536 0 0.0
.bss 139328 139328 0 0.0
.data 2808 2808 0 0.0
.text 1489800 1489800 0 0.0
light-app default (read/write) 2421592 2421592 0 0.0
.bss 132656 132656 0 0.0
.data 2608 2608 0 0.0
.text 1379856 1379856 0 0.0
lock-app default (read/write) 2431096 2431096 0 0.0
.bss 132472 132472 0 0.0
.data 2568 2568 0 0.0
.text 1389360 1389360 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 806024 806024 0 0.0
bss 72176 72176 0 0.0
noinit 40416 40416 0 0.0
text 572426 572426 0 0.0

@andy31415 andy31415 merged commit 11587f5 into project-chip:master May 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anush-apple anush-apple Awaiting requested review from anush-apple

@arkq arkq Awaiting requested review from arkq

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@hawk248 hawk248 Awaiting requested review from hawk248

@holbrookt holbrookt Awaiting requested review from holbrookt

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@rgoliver rgoliver Awaiting requested review from rgoliver

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

@msandstedt msandstedt Awaiting requested review from msandstedt

Assignees
No one assigned
Labels
crypto review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@emargolis @msandstedt @bzbarsky-apple @andy31415