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

Fix CryptoBuildConfig.h usage #20887

Merged
merged 2 commits into from
Jul 19, 2022
Merged

Fix CryptoBuildConfig.h usage #20887

merged 2 commits into from
Jul 19, 2022

Conversation

tcarmelveilleux
Copy link
Contributor

Problem

PR #20824 moved some defines out of CryptoBuildConfig.h by mistake.

This caused some defines to be globalized but only in GN builds.

Fixes #20883

Change overview

This PR brings back the defines in CryptoBuildConfig.h and
fixes what's needed for that to build

Testing

  • Unit tests still pass
  • Integration tests still pass

@tcarmelveilleux
Fix CryptoBuildConfig.h usage
3ceee15 
PR project-chip#20824 moved some defines out of CryptoBuildConfig.h by mistake.

This caused some defines to be globalized but only in GN builds.

Fixes project-chip#20883

This PR brings back the defines in CryptoBuildConfig.h and
fixes what's needed for that to build

Testing done:

- Unit tests still pass
- Integration tests still pass
@boring-cyborg boring-cyborg bot added the crypto label Jul 18, 2022
@github-actions
Copy link

github-actions bot commented Jul 18, 2022 •
edited
Loading

PR #20887: Size comparison from 5b93d57 to 42be9ed

Increases (1 build for esp32)
platform target config section 5b93d57 42be9ed change % change
esp32 all-clusters-app c3devkit (read only) 1021566 1021568 2 0.0
.flash.text 1021566 1021568 2 0.0
Decreases (4 builds for cyw30739, k32w, nrfconnect, telink)
platform target config section 5b93d57 42be9ed change % change
cyw30739 lock cyw930739m2evb_01 (read/write) 587906 587898 -8 -0.0
.app_xip_area 461740 461732 -8 -0.0
k32w lock k32w061+release (read/write) 687700 687684 -16 -0.0
.text 609892 609876 -16 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 812472 812468 -4 -0.0
telink light-switch-app tlsr9518adk80d text 566614 566612 -2 -0.0
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 5b93d57 42be9ed change % change
bl602 lighting-app bl602 (read/write) 1383418 1383418 0 0.0
.bss 116978 116978 0 0.0
.data 4480 4480 0 0.0
.text 1053500 1053500 0 0.0
bl602+rpc (read/write) 1428826 1428826 0 0.0
.bss 124418 124418 0 0.0
.data 4600 4600 0 0.0
.text 1085156 1085156 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668399 668399 0 0.0
(read/write) 182840 182840 0 0.0
.bss 74132 74132 0 0.0
.data 3356 3356 0 0.0
.rodata 88271 88271 0 0.0
.text 579812 579812 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 634039 634039 0 0.0
(read/write) 157700 157700 0 0.0
.bss 73428 73428 0 0.0
.data 3356 3356 0 0.0
.rodata 77511 77511 0 0.0
.text 556204 556204 0 0.0
lock-ftd LP_CC2652R7 (read only) 671619 671619 0 0.0
(read/write) 169796 169796 0 0.0
.bss 71196 71196 0 0.0
.data 3280 3280 0 0.0
.rodata 76411 76411 0 0.0
.text 594728 594728 0 0.0
lock-mtd LP_CC2652R7 (read only) 653871 653871 0 0.0
(read/write) 183232 183232 0 0.0
.bss 66884 66884 0 0.0
.data 3280 3280 0 0.0
.rodata 101151 101151 0 0.0
.text 552240 552240 0 0.0
pump-app LP_CC2652R7 (read only) 680587 680587 0 0.0
(read/write) 161676 161676 0 0.0
.bss 71276 71276 0 0.0
.data 3280 3280 0 0.0
.rodata 88771 88771 0 0.0
.text 591332 591332 0 0.0
pump-controller-app LP_CC2652R7 (read only) 666387 666387 0 0.0
(read/write) 175996 175996 0 0.0
.bss 71396 71396 0 0.0
.data 3276 3276 0 0.0
.rodata 84627 84627 0 0.0
.text 581280 581280 0 0.0
shell LP_CC2652R7 (read only) 660890 660890 0 0.0
(read/write) 185852 185852 0 0.0
.bss 76436 76436 0 0.0
.data 3360 3360 0 0.0
.rodata 85058 85058 0 0.0
.text 575516 575516 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 581990 581990 0 0.0
.app_xip_area 460552 460552 0 0.0
.bss 64232 64232 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 587906 587898 -8 -0.0
.app_xip_area 461740 461732 -8 -0.0
.bss 68960 68960 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 585266 585266 0 0.0
.app_xip_area 464676 464676 0 0.0
.bss 63440 63440 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1084640 1084640 0 0.0
.bss 133044 133044 0 0.0
.data 2048 2048 0 0.0
.text 949528 949528 0 0.0
BRD4161A+rpc (read/write) 1138932 1138932 0 0.0
.bss 149724 149724 0 0.0
.data 2260 2260 0 0.0
.text 986924 986924 0 0.0
BRD4161A+rs911x (read/write) 950008 950008 0 0.0
.bss 140768 140768 0 0.0
.data 2048 2048 0 0.0
.text 807172 807172 0 0.0
lock-app BRD4161A+wf200 (read/write) 1127788 1127788 0 0.0
.bss 144136 144136 0 0.0
.data 2056 2056 0 0.0
.text 981576 981576 0 0.0
window-app BRD4161A (read/write) 1078132 1078132 0 0.0
.bss 134516 134516 0 0.0
.data 2076 2076 0 0.0
.text 941520 941520 0 0.0
esp32 all-clusters-app c3devkit (read only) 1021566 1021568 2 0.0
(read/write) 1485978 1485978 0 0.0
.dram0.bss 70080 70080 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 215864 215864 0 0.0
.flash.text 1021566 1021568 2 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1075299 1075299 0 0.0
(read/write) 488024 488024 0 0.0
.dram0.bss 75600 75600 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246284 246284 0 0.0
.flash.text 1069915 1069915 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 660748 660748 0 0.0
.bss 69540 69540 0 0.0
.data 1992 1992 0 0.0
.text 583416 583416 0 0.0
lock k32w061+release (read/write) 687700 687684 -16 -0.0
.bss 70004 70004 0 0.0
.data 2004 2004 0 0.0
.text 609892 609876 -16 -0.0
linux all-clusters-app debug (read only) 2972105 2972105 0 0.0
(read/write) 155016 155016 0 0.0
.bss 61664 61664 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 85048 85048 0 0.0
.dynamic 608 608 0 0.0
.got 4560 4560 0 0.0
.init 27 27 0 0.0
.init_array 1056 1056 0 0.0
.rodata 264669 264669 0 0.0
.text 2529842 2529842 0 0.0
all-clusters-minimal-app debug (read only) 2818713 2818713 0 0.0
(read/write) 146688 146688 0 0.0
.bss 60864 60864 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 77608 77608 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 1048 1048 0 0.0
.rodata 265597 265597 0 0.0
.text 2378178 2378178 0 0.0
bridge-app debug+rpc (read only) 2318985 2318985 0 0.0
(read/write) 125504 125504 0 0.0
.bss 48928 48928 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 66984 66984 0 0.0
.dynamic 608 608 0 0.0
.got 4384 4384 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 198208 198208 0 0.0
.text 1959138 1959138 0 0.0
chip-tool debug (read only) 10278873 10278873 0 0.0
(read/write) 628544 628544 0 0.0
.bss 24728 24728 0 0.0
.data 3234 3234 0 0.0
.data.rel.ro 594208 594208 0 0.0
.dynamic 608 608 0 0.0
.got 5088 5088 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 514101 514101 0 0.0
.text 8318980 8318980 0 0.0
chip-tool-ipv6only arm64 (read only) 10021052 10021052 0 0.0
(read/write) 693617 693617 0 0.0
.bss 42961 42961 0 0.0
.data 3304 3304 0 0.0
.data.rel.ro 629816 629816 0 0.0
.dynamic 528 528 0 0.0
.got 13616 13616 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 478236 478236 0 0.0
.text 7965108 7965108 0 0.0
lighting-app debug+rpc (read only) 2556761 2556761 0 0.0
(read/write) 129528 129528 0 0.0
.bss 49440 49440 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72136 72136 0 0.0
.dynamic 608 608 0 0.0
.got 4384 4384 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 214056 214056 0 0.0
.text 2172834 2172834 0 0.0
lock-app debug (read only) 2521593 2521593 0 0.0
(read/write) 124512 124512 0 0.0
.bss 47840 47840 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69096 69096 0 0.0
.dynamic 608 608 0 0.0
.got 4416 4416 0 0.0
.init 27 27 0 0.0
.init_array 792 792 0 0.0
.rodata 229032 229032 0 0.0
.text 2127490 2127490 0 0.0
ota-provider-app debug (read only) 2325169 2325169 0 0.0
(read/write) 118312 118312 0 0.0
.bss 47488 47488 0 0.0
.data 1944 1944 0 0.0
.data.rel.ro 63096 63096 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 203800 203800 0 0.0
.text 1958690 1958690 0 0.0
ota-requestor-app debug (read only) 2442745 2442745 0 0.0
(read/write) 125216 125216 0 0.0
.bss 49856 49856 0 0.0
.data 2232 2232 0 0.0
.data.rel.ro 67304 67304 0 0.0
.dynamic 608 608 0 0.0
.got 4472 4472 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 207520 207520 0 0.0
.text 2064146 2064146 0 0.0
shell debug (read only) 2559009 2559009 0 0.0
(read/write) 141104 141104 0 0.0
.bss 57448 57448 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 76688 76688 0 0.0
.dynamic 608 608 0 0.0
.got 4128 4128 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 228050 228050 0 0.0
.text 2173954 2173954 0 0.0
thermostat-no-ble arm64 (read only) 2599556 2599556 0 0.0
(read/write) 158257 158257 0 0.0
.bss 65249 65249 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 83216 83216 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 165700 165700 0 0.0
.text 2194112 2194112 0 0.0
tv-app debug (read only) 3107129 3107129 0 0.0
(read/write) 257704 257704 0 0.0
.bss 167016 167016 0 0.0
.data 4848 4848 0 0.0
.data.rel.ro 79392 79392 0 0.0
.dynamic 608 608 0 0.0
.got 4840 4840 0 0.0
.init 27 27 0 0.0
.init_array 952 952 0 0.0
.rodata 249440 249440 0 0.0
.text 2669890 2669890 0 0.0
tv-casting-app debug (read only) 5349409 5349409 0 0.0
(read/write) 156848 156848 0 0.0
.bss 50248 50248 0 0.0
.data 2416 2416 0 0.0
.data.rel.ro 97928 97928 0 0.0
.dynamic 608 608 0 0.0
.got 4736 4736 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 331625 331625 0 0.0
.text 4752530 4752530 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2448952 2448952 0 0.0
.bss 213940 213940 0 0.0
.data 5872 5872 0 0.0
.text 1411596 1411596 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1176443 1176443 0 0.0
bss 142900 142900 0 0.0
rodata 142164 142164 0 0.0
text 812472 812468 -4 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1156507 1156507 0 0.0
bss 142136 142136 0 0.0
rodata 133708 133708 0 0.0
text 801780 801780 0 0.0
p6 all-clusters-app default (read/write) 2568432 2568432 0 0.0
.bss 149120 149120 0 0.0
.data 2776 2776 0 0.0
.text 1526696 1526696 0 0.0
all-clusters-minimal-app default (read/write) 2513312 2513312 0 0.0
.bss 148400 148400 0 0.0
.data 2776 2776 0 0.0
.text 1471576 1471576 0 0.0
light-app default (read/write) 2443296 2443296 0 0.0
.bss 140456 140456 0 0.0
.data 2592 2592 0 0.0
.text 1401560 1401560 0 0.0
lock-app default (read/write) 2470384 2470384 0 0.0
.bss 140304 140304 0 0.0
.data 2600 2600 0 0.0
.text 1428648 1428648 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 798456 798456 0 0.0
bss 70576 70576 0 0.0
noinit 40416 40416 0 0.0
text 566614 566612 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 818496 818496 0 0.0
bss 71420 71420 0 0.0
noinit 40416 40416 0 0.0
text 583148 583148 0 0.0

@woody-apple woody-apple merged commit 768b575 into project-chip:master Jul 19, 2022
github-actions bot pushed a commit that referenced this pull request Jul 19, 2022
@tcarmelveilleux @web-flow
Fix CryptoBuildConfig.h usage (#20887)
f04e2d9 
* Fix CryptoBuildConfig.h usage

PR #20824 moved some defines out of CryptoBuildConfig.h by mistake.

This caused some defines to be globalized but only in GN builds.

Fixes #20883

This PR brings back the defines in CryptoBuildConfig.h and
fixes what's needed for that to build

Testing done:

- Unit tests still pass
- Integration tests still pass

* Add BoringSSL coverage to rotating ID build
@cletnick cletnick mentioned this pull request Jul 19, 2022
Closed
woody-apple added a commit that referenced this pull request Jul 19, 2022
@woody-apple @tcarmelveilleux
Fix CryptoBuildConfig.h usage (#20887) (#20904)
2c749fb 
* Fix CryptoBuildConfig.h usage

PR #20824 moved some defines out of CryptoBuildConfig.h by mistake.

This caused some defines to be globalized but only in GN builds.

Fixes #20883

This PR brings back the defines in CryptoBuildConfig.h and
fixes what's needed for that to build

Testing done:

- Unit tests still pass
- Integration tests still pass

* Add BoringSSL coverage to rotating ID build

Co-authored-by: Tennessee Carmel-Veilleux <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@woody-apple woody-apple woody-apple approved these changes

@emargolis emargolis emargolis approved these changes

@andy31415 andy31415 andy31415 approved these changes

@mspang mspang mspang approved these changes

@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

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

@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

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

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

@hawk248 hawk248 Awaiting requested review from hawk248

@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

@kghost kghost Awaiting requested review from kghost

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

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

@msandstedt msandstedt Awaiting requested review from msandstedt

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@vijs vijs Awaiting requested review from vijs

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

@wbschiller wbschiller Awaiting requested review from wbschiller

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

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

Successfully merging this pull request may close these issues.

Added GN dependency mistakenly added in #20824
5 participants
@tcarmelveilleux @mspang @andy31415 @emargolis @woody-apple