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

[nrfconnect] Fix handling Spake2+ salt in factory data script #20924

Merged
merged 5 commits into from
Jul 19, 2022
Merged

[nrfconnect] Fix handling Spake2+ salt in factory data script #20924

merged 5 commits into from
Jul 19, 2022

Conversation

Damian-Nordic
Copy link
Contributor

Problem

The script takes base64-encoded salt and passes it to spake2p tool that expects an ascii string. It generates an incorrect Spake2+ verifier.

Change overview

  • Decode base64 salt before passing it over.
  • Fix comments and help texts.
  • Add unit tests to verify basic functionality of the script.

Testing

Built nRF Connect lock-app with -DCONFIG_CHIP_FACTORY_DATA=y -DCONFIG_CHIP_FACTORY_DATA_BUILD=y -DCONFIG_CHIP_DEVICE_SPAKE2_PASSCODE=20212223 -DCONFIG_CHIP_FACTORY_DATA_GENERATE_SPAKE2_VERIFIER=y flags and commissioned the device.
Added unit tests to verify the factory data generation script output.

@github-actions
Copy link

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

PR #20924: Size comparison from ea78432 to 4d398c8

Increases (1 build for esp32)
platform target config section ea78432 4d398c8 change % change
esp32 all-clusters-app c3devkit (read only) 1021762 1021764 2 0.0
.flash.text 1021762 1021764 2 0.0
Decreases (2 builds for bl602)
platform target config section ea78432 4d398c8 change % change
bl602 lighting-app bl602 .text 1050420 1050416 -4 -0.0
bl602+rpc .text 1082076 1082072 -4 -0.0
Full report (41 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, p6, telink)
platform target config section ea78432 4d398c8 change % change
bl602 lighting-app bl602 (read/write) 1379762 1379762 0 0.0
.bss 116962 116962 0 0.0
.data 4480 4480 0 0.0
.text 1050420 1050416 -4 -0.0
bl602+rpc (read/write) 1425170 1425170 0 0.0
.bss 124410 124410 0 0.0
.data 4600 4600 0 0.0
.text 1082076 1082072 -4 -0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668599 668599 0 0.0
(read/write) 182640 182640 0 0.0
.bss 74132 74132 0 0.0
.data 3356 3356 0 0.0
.rodata 88319 88319 0 0.0
.text 579964 579964 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 634223 634223 0 0.0
(read/write) 157700 157700 0 0.0
.bss 73428 73428 0 0.0
.data 3356 3356 0 0.0
.rodata 77551 77551 0 0.0
.text 556348 556348 0 0.0
lock-ftd LP_CC2652R7 (read only) 671811 671811 0 0.0
(read/write) 169604 169604 0 0.0
.bss 71196 71196 0 0.0
.data 3280 3280 0 0.0
.rodata 76451 76451 0 0.0
.text 594880 594880 0 0.0
lock-mtd LP_CC2652R7 (read only) 654095 654095 0 0.0
(read/write) 183008 183008 0 0.0
.bss 66884 66884 0 0.0
.data 3280 3280 0 0.0
.rodata 101199 101199 0 0.0
.text 552416 552416 0 0.0
pump-app LP_CC2652R7 (read only) 680795 680795 0 0.0
(read/write) 161468 161468 0 0.0
.bss 71276 71276 0 0.0
.data 3280 3280 0 0.0
.rodata 88811 88811 0 0.0
.text 591500 591500 0 0.0
pump-controller-app LP_CC2652R7 (read only) 666587 666587 0 0.0
(read/write) 175796 175796 0 0.0
.bss 71396 71396 0 0.0
.data 3276 3276 0 0.0
.rodata 84675 84675 0 0.0
.text 581432 581432 0 0.0
shell LP_CC2652R7 (read only) 661098 661098 0 0.0
(read/write) 185644 185644 0 0.0
.bss 76436 76436 0 0.0
.data 3360 3360 0 0.0
.rodata 85098 85098 0 0.0
.text 575684 575684 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 582142 582142 0 0.0
.app_xip_area 460704 460704 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) 588058 588058 0 0.0
.app_xip_area 461892 461892 0 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) 585474 585474 0 0.0
.app_xip_area 464884 464884 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) 1084792 1084792 0 0.0
.bss 133044 133044 0 0.0
.data 2048 2048 0 0.0
.text 949680 949680 0 0.0
BRD4161A+rpc (read/write) 1139084 1139084 0 0.0
.bss 149724 149724 0 0.0
.data 2260 2260 0 0.0
.text 987076 987076 0 0.0
BRD4161A+rs911x (read/write) 950160 950160 0 0.0
.bss 140768 140768 0 0.0
.data 2048 2048 0 0.0
.text 807324 807324 0 0.0
lock-app BRD4161A+wf200 (read/write) 1128004 1128004 0 0.0
.bss 144136 144136 0 0.0
.data 2056 2056 0 0.0
.text 981792 981792 0 0.0
window-app BRD4161A (read/write) 1078284 1078284 0 0.0
.bss 134516 134516 0 0.0
.data 2076 2076 0 0.0
.text 941672 941672 0 0.0
esp32 all-clusters-app c3devkit (read only) 1021762 1021764 2 0.0
(read/write) 1486026 1486026 0 0.0
.dram0.bss 70080 70080 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 215912 215912 0 0.0
.flash.text 1021762 1021764 2 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1075507 1075507 0 0.0
(read/write) 488064 488064 0 0.0
.dram0.bss 75600 75600 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246324 246324 0 0.0
.flash.text 1070123 1070123 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 660924 660924 0 0.0
.bss 69540 69540 0 0.0
.data 1992 1992 0 0.0
.text 583592 583592 0 0.0
lock k32w061+release (read/write) 687908 687908 0 0.0
.bss 70004 70004 0 0.0
.data 2004 2004 0 0.0
.text 610100 610100 0 0.0
linux all-clusters-app debug (read only) 2973161 2973161 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 264733 264733 0 0.0
.text 2530834 2530834 0 0.0
all-clusters-minimal-app debug (read only) 2819721 2819721 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 265661 265661 0 0.0
.text 2379122 2379122 0 0.0
bridge-app debug+rpc (read only) 2320009 2320009 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 198240 198240 0 0.0
.text 1960130 1960130 0 0.0
chip-tool debug (read only) 10295393 10295393 0 0.0
(read/write) 629504 629504 0 0.0
.bss 24728 24728 0 0.0
.data 3234 3234 0 0.0
.data.rel.ro 595152 595152 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 515765 515765 0 0.0
.text 8331604 8331604 0 0.0
chip-tool-ipv6only arm64 (read only) 10036380 10036380 0 0.0
(read/write) 694577 694577 0 0.0
.bss 42961 42961 0 0.0
.data 3304 3304 0 0.0
.data.rel.ro 630768 630768 0 0.0
.dynamic 528 528 0 0.0
.got 13624 13624 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 479820 479820 0 0.0
.text 7976596 7976596 0 0.0
lighting-app debug+rpc (read only) 2557785 2557785 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 214088 214088 0 0.0
.text 2173826 2173826 0 0.0
lock-app debug (read only) 2522617 2522617 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 229064 229064 0 0.0
.text 2128482 2128482 0 0.0
ota-provider-app debug (read only) 2326209 2326209 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 203832 203832 0 0.0
.text 1959698 1959698 0 0.0
ota-requestor-app debug (read only) 2443817 2443817 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 207584 207584 0 0.0
.text 2065154 2065154 0 0.0
shell debug (read only) 2560065 2560065 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 228114 228114 0 0.0
.text 2174946 2174946 0 0.0
thermostat-no-ble arm64 (read only) 2600676 2600676 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 165748 165748 0 0.0
.text 2195184 2195184 0 0.0
tv-app debug (read only) 3108121 3108121 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 249504 249504 0 0.0
.text 2670818 2670818 0 0.0
tv-casting-app debug (read only) 5356241 5356241 0 0.0
(read/write) 157664 157664 0 0.0
.bss 51016 51016 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 912 912 0 0.0
.rodata 332841 332841 0 0.0
.text 4758002 4758002 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2449128 2449128 0 0.0
.bss 213940 213940 0 0.0
.data 5872 5872 0 0.0
.text 1411772 1411772 0 0.0
p6 all-clusters-app default (read only) 882136 882136 0 0.0
(read/write) 1685036 1685036 0 0.0
.bss 148560 148560 0 0.0
.data 2648 2648 0 0.0
.text 1525440 1525440 0 0.0
all-clusters-minimal-app default (read only) 882856 882856 0 0.0
(read/write) 1629180 1629180 0 0.0
.bss 147840 147840 0 0.0
.data 2648 2648 0 0.0
.text 1470304 1470304 0 0.0
light-app default (read only) 891160 891160 0 0.0
(read/write) 1549220 1549220 0 0.0
.bss 139744 139744 0 0.0
.data 2440 2440 0 0.0
.text 1398648 1398648 0 0.0
lock-app default (read only) 891288 891288 0 0.0
(read/write) 1576220 1576220 0 0.0
.bss 139600 139600 0 0.0
.data 2456 2456 0 0.0
.text 1425776 1425776 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 798700 798700 0 0.0
bss 70576 70576 0 0.0
noinit 40416 40416 0 0.0
text 566814 566814 0 0.0
lighting-app tlsr9518adk80d (read/write) 818740 818740 0 0.0
bss 71420 71420 0 0.0
noinit 40416 40416 0 0.0
text 583346 583346 0 0.0

@github-actions
Copy link

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

PR #20924: Size comparison from fcd6594 to d74677c

Increases (1 build for esp32)
platform target config section fcd6594 d74677c change % change
esp32 all-clusters-app c3devkit (read only) 1021762 1021764 2 0.0
.flash.text 1021762 1021764 2 0.0
Decreases (2 builds for nrfconnect, telink)
platform target config section fcd6594 d74677c change % change
nrfconnect lighting-app nrf52840dongle_nrf52840 text 748432 748428 -4 -0.0
telink light-switch-app tlsr9518adk80d text 566814 566812 -2 -0.0
Full report (51 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section fcd6594 d74677c change % change
bl602 lighting-app bl602 (read/write) 1379762 1379762 0 0.0
.bss 116962 116962 0 0.0
.data 4480 4480 0 0.0
.text 1050416 1050416 0 0.0
bl602+rpc (read/write) 1425170 1425170 0 0.0
.bss 124410 124410 0 0.0
.data 4600 4600 0 0.0
.text 1082072 1082072 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668599 668599 0 0.0
(read/write) 182640 182640 0 0.0
.bss 74132 74132 0 0.0
.data 3356 3356 0 0.0
.rodata 88319 88319 0 0.0
.text 579964 579964 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 634223 634223 0 0.0
(read/write) 157700 157700 0 0.0
.bss 73428 73428 0 0.0
.data 3356 3356 0 0.0
.rodata 77551 77551 0 0.0
.text 556348 556348 0 0.0
lock-ftd LP_CC2652R7 (read only) 671811 671811 0 0.0
(read/write) 169604 169604 0 0.0
.bss 71196 71196 0 0.0
.data 3280 3280 0 0.0
.rodata 76451 76451 0 0.0
.text 594880 594880 0 0.0
lock-mtd LP_CC2652R7 (read only) 654095 654095 0 0.0
(read/write) 183008 183008 0 0.0
.bss 66884 66884 0 0.0
.data 3280 3280 0 0.0
.rodata 101199 101199 0 0.0
.text 552416 552416 0 0.0
pump-app LP_CC2652R7 (read only) 680795 680795 0 0.0
(read/write) 161468 161468 0 0.0
.bss 71276 71276 0 0.0
.data 3280 3280 0 0.0
.rodata 88811 88811 0 0.0
.text 591500 591500 0 0.0
pump-controller-app LP_CC2652R7 (read only) 666587 666587 0 0.0
(read/write) 175796 175796 0 0.0
.bss 71396 71396 0 0.0
.data 3276 3276 0 0.0
.rodata 84675 84675 0 0.0
.text 581432 581432 0 0.0
shell LP_CC2652R7 (read only) 661098 661098 0 0.0
(read/write) 185644 185644 0 0.0
.bss 76436 76436 0 0.0
.data 3360 3360 0 0.0
.rodata 85098 85098 0 0.0
.text 575684 575684 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 582142 582142 0 0.0
.app_xip_area 460704 460704 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) 588058 588058 0 0.0
.app_xip_area 461892 461892 0 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) 585474 585474 0 0.0
.app_xip_area 464884 464884 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) 1084792 1084792 0 0.0
.bss 133044 133044 0 0.0
.data 2048 2048 0 0.0
.text 949680 949680 0 0.0
BRD4161A+rpc (read/write) 1139084 1139084 0 0.0
.bss 149724 149724 0 0.0
.data 2260 2260 0 0.0
.text 987076 987076 0 0.0
BRD4161A+rs911x (read/write) 950160 950160 0 0.0
.bss 140768 140768 0 0.0
.data 2048 2048 0 0.0
.text 807324 807324 0 0.0
lock-app BRD4161A+wf200 (read/write) 1128004 1128004 0 0.0
.bss 144136 144136 0 0.0
.data 2056 2056 0 0.0
.text 981792 981792 0 0.0
window-app BRD4161A (read/write) 1078284 1078284 0 0.0
.bss 134516 134516 0 0.0
.data 2076 2076 0 0.0
.text 941672 941672 0 0.0
esp32 all-clusters-app c3devkit (read only) 1021762 1021764 2 0.0
(read/write) 1486026 1486026 0 0.0
.dram0.bss 70080 70080 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 215912 215912 0 0.0
.flash.text 1021762 1021764 2 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1075507 1075507 0 0.0
(read/write) 488064 488064 0 0.0
.dram0.bss 75600 75600 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246324 246324 0 0.0
.flash.text 1070123 1070123 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 660924 660924 0 0.0
.bss 69540 69540 0 0.0
.data 1992 1992 0 0.0
.text 583592 583592 0 0.0
lock k32w061+release (read/write) 687908 687908 0 0.0
.bss 70004 70004 0 0.0
.data 2004 2004 0 0.0
.text 610100 610100 0 0.0
linux all-clusters-app debug (read only) 2975641 2975641 0 0.0
(read/write) 155152 155152 0 0.0
.bss 61696 61696 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 85160 85160 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 1064 1064 0 0.0
.rodata 264733 264733 0 0.0
.text 2532930 2532930 0 0.0
all-clusters-minimal-app debug (read only) 2822201 2822201 0 0.0
(read/write) 146824 146824 0 0.0
.bss 60896 60896 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 77720 77720 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1056 1056 0 0.0
.rodata 265661 265661 0 0.0
.text 2381218 2381218 0 0.0
bridge-app debug+rpc (read only) 2322489 2322489 0 0.0
(read/write) 125640 125640 0 0.0
.bss 48960 48960 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 67096 67096 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 198240 198240 0 0.0
.text 1962226 1962226 0 0.0
chip-tool debug (read only) 10297761 10297761 0 0.0
(read/write) 629640 629640 0 0.0
.bss 24760 24760 0 0.0
.data 3234 3234 0 0.0
.data.rel.ro 595256 595256 0 0.0
.dynamic 608 608 0 0.0
.got 5088 5088 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 515765 515765 0 0.0
.text 8333684 8333684 0 0.0
chip-tool-ipv6only arm64 (read only) 10038380 10038380 0 0.0
(read/write) 694801 694801 0 0.0
.bss 42993 42993 0 0.0
.data 3304 3304 0 0.0
.data.rel.ro 630920 630920 0 0.0
.dynamic 528 528 0 0.0
.got 13656 13656 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 479820 479820 0 0.0
.text 7978196 7978196 0 0.0
lighting-app debug+rpc (read only) 2560265 2560265 0 0.0
(read/write) 129664 129664 0 0.0
.bss 49472 49472 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72248 72248 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 824 824 0 0.0
.rodata 214088 214088 0 0.0
.text 2175922 2175922 0 0.0
lock-app debug (read only) 2525097 2525097 0 0.0
(read/write) 124648 124648 0 0.0
.bss 47872 47872 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69208 69208 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 800 800 0 0.0
.rodata 229064 229064 0 0.0
.text 2130578 2130578 0 0.0
ota-provider-app debug (read only) 2328673 2328673 0 0.0
(read/write) 118448 118448 0 0.0
.bss 47520 47520 0 0.0
.data 1944 1944 0 0.0
.data.rel.ro 63192 63192 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 680 680 0 0.0
.rodata 203832 203832 0 0.0
.text 1961778 1961778 0 0.0
ota-requestor-app debug (read only) 2446281 2446281 0 0.0
(read/write) 125384 125384 0 0.0
.bss 49888 49888 0 0.0
.data 2232 2232 0 0.0
.data.rel.ro 67416 67416 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 207584 207584 0 0.0
.text 2067234 2067234 0 0.0
shell debug (read only) 2562545 2562545 0 0.0
(read/write) 141240 141240 0 0.0
.bss 57480 57480 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 76792 76792 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 936 936 0 0.0
.rodata 228114 228114 0 0.0
.text 2177042 2177042 0 0.0
thermostat-no-ble arm64 (read only) 2603116 2603116 0 0.0
(read/write) 158481 158481 0 0.0
.bss 65281 65281 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 83368 83368 0 0.0
.dynamic 528 528 0 0.0
.got 5104 5104 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 165748 165748 0 0.0
.text 2197072 2197072 0 0.0
tv-app debug (read only) 3110585 3110585 0 0.0
(read/write) 257840 257840 0 0.0
.bss 167048 167048 0 0.0
.data 4848 4848 0 0.0
.data.rel.ro 79496 79496 0 0.0
.dynamic 608 608 0 0.0
.got 4848 4848 0 0.0
.init 27 27 0 0.0
.init_array 960 960 0 0.0
.rodata 249504 249504 0 0.0
.text 2672898 2672898 0 0.0
tv-casting-app debug (read only) 5358625 5358625 0 0.0
(read/write) 157800 157800 0 0.0
.bss 51048 51048 0 0.0
.data 2416 2416 0 0.0
.data.rel.ro 98032 98032 0 0.0
.dynamic 608 608 0 0.0
.got 4736 4736 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 332841 332841 0 0.0
.text 4760098 4760098 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2449128 2449128 0 0.0
.bss 213940 213940 0 0.0
.data 5872 5872 0 0.0
.text 1411772 1411772 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1176643 1176643 0 0.0
bss 142900 142900 0 0.0
rodata 142204 142204 0 0.0
text 812636 812636 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1156675 1156675 0 0.0
bss 142136 142136 0 0.0
rodata 133748 133748 0 0.0
text 801920 801920 0 0.0
lighting-app nrf52840dk_nrf52840 (read/write) 1167875 1167875 0 0.0
bss 144463 144463 0 0.0
rodata 124116 124116 0 0.0
text 820444 820444 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 1138007 1138007 0 0.0
bss 144892 144892 0 0.0
rodata 115656 115656 0 0.0
text 798208 798208 0 0.0
nrf52840dongle_nrf52840 (read/write) 1074383 1074383 0 0.0
bss 151694 151694 0 0.0
rodata 93136 93136 0 0.0
text 748432 748428 -4 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 1071430 1071430 0 0.0
bss 140834 140834 0 0.0
rodata 116532 116532 0 0.0
text 732988 732988 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 1128707 1128707 0 0.0
bss 135431 135431 0 0.0
rodata 142020 142020 0 0.0
text 772448 772448 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 1032418 1032418 0 0.0
bss 131834 131834 0 0.0
rodata 134496 134496 0 0.0
text 685060 685060 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 1080487 1080487 0 0.0
bss 134358 134358 0 0.0
rodata 117464 117464 0 0.0
text 749828 749828 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 1068455 1068455 0 0.0
bss 134153 134153 0 0.0
rodata 114248 114248 0 0.0
text 741144 741144 0 0.0
p6 all-clusters-app default (read only) 882136 882136 0 0.0
(read/write) 1685036 1685036 0 0.0
.bss 148560 148560 0 0.0
.data 2648 2648 0 0.0
.text 1525440 1525440 0 0.0
all-clusters-minimal-app default (read only) 882856 882856 0 0.0
(read/write) 1629180 1629180 0 0.0
.bss 147840 147840 0 0.0
.data 2648 2648 0 0.0
.text 1470304 1470304 0 0.0
light-app default (read only) 891160 891160 0 0.0
(read/write) 1549220 1549220 0 0.0
.bss 139744 139744 0 0.0
.data 2440 2440 0 0.0
.text 1398648 1398648 0 0.0
lock-app default (read only) 891288 891288 0 0.0
(read/write) 1576220 1576220 0 0.0
.bss 139600 139600 0 0.0
.data 2456 2456 0 0.0
.text 1425776 1425776 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 798700 798700 0 0.0
bss 70576 70576 0 0.0
noinit 40416 40416 0 0.0
text 566814 566812 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 818732 818732 0 0.0
bss 71420 71420 0 0.0
noinit 40416 40416 0 0.0
text 583344 583344 0 0.0

@Damian-Nordic
[nrfconnect] Fix handling Spake2+ salt in factory data script
36cc674 
The script would take base64-encoded salt and pass it to
spake2p tool that expects an ascii string. It would generate
an incorrect Spake2+ verifier.

Signed-off-by: Damian Krolik <[email protected]>
@Damian-Nordic
Fix and improve comments and help texts
a05c180 
Signed-off-by: Damian Krolik <[email protected]>
@Damian-Nordic
Add unit tests
f5e83c3
@Damian-Nordic
Update spake2p tool to take base64 salt
3832c09
@github-actions
Copy link

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

PR #20924: Size comparison from 4cdecc9 to c008351

Increases (1 build for telink)
platform target config section 4cdecc9 c008351 change % change
telink lighting-app tlsr9518adk80d text 582892 582894 2 0.0
Decreases (2 builds for esp32, mbed)
platform target config section 4cdecc9 c008351 change % change
esp32 all-clusters-app c3devkit (read only) 1021374 1021372 -2 -0.0
.flash.text 1021374 1021372 -2 -0.0
mbed lock-app CY8CPROTO_062_4343W+release (read/write) 2448416 2448352 -64 -0.0
.text 1411060 1410996 -64 -0.0
Full report (30 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, p6, telink)
platform target config section 4cdecc9 c008351 change % change
bl602 lighting-app bl602 (read/write) 1379314 1379314 0 0.0
.bss 116970 116970 0 0.0
.data 4480 4480 0 0.0
.text 1049952 1049952 0 0.0
bl602+rpc (read/write) 1424722 1424722 0 0.0
.bss 124418 124418 0 0.0
.data 4600 4600 0 0.0
.text 1081608 1081608 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 667959 667959 0 0.0
(read/write) 183288 183288 0 0.0
.bss 74140 74140 0 0.0
.data 3356 3356 0 0.0
.rodata 88319 88319 0 0.0
.text 579324 579324 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 633559 633559 0 0.0
(read/write) 157708 157708 0 0.0
.bss 73436 73436 0 0.0
.data 3356 3356 0 0.0
.rodata 77551 77551 0 0.0
.text 555684 555684 0 0.0
lock-ftd LP_CC2652R7 (read only) 671067 671067 0 0.0
(read/write) 170356 170356 0 0.0
.bss 71204 71204 0 0.0
.data 3280 3280 0 0.0
.rodata 76443 76443 0 0.0
.text 594144 594144 0 0.0
lock-mtd LP_CC2652R7 (read only) 653343 653343 0 0.0
(read/write) 183768 183768 0 0.0
.bss 66892 66892 0 0.0
.data 3280 3280 0 0.0
.rodata 101191 101191 0 0.0
.text 551672 551672 0 0.0
pump-app LP_CC2652R7 (read only) 680059 680059 0 0.0
(read/write) 162212 162212 0 0.0
.bss 71284 71284 0 0.0
.data 3280 3280 0 0.0
.rodata 88811 88811 0 0.0
.text 590764 590764 0 0.0
pump-controller-app LP_CC2652R7 (read only) 665843 665843 0 0.0
(read/write) 176548 176548 0 0.0
.bss 71404 71404 0 0.0
.data 3276 3276 0 0.0
.rodata 84675 84675 0 0.0
.text 580688 580688 0 0.0
shell LP_CC2652R7 (read only) 660434 660434 0 0.0
(read/write) 186316 186316 0 0.0
.bss 76444 76444 0 0.0
.data 3360 3360 0 0.0
.rodata 85090 85090 0 0.0
.text 575028 575028 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 581382 581382 0 0.0
.app_xip_area 459936 459936 0 0.0
.bss 64240 64240 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) 587290 587290 0 0.0
.app_xip_area 461116 461116 0 0.0
.bss 68968 68968 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) 584738 584738 0 0.0
.app_xip_area 464140 464140 0 0.0
.bss 63448 63448 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) 1085616 1085616 0 0.0
.bss 133052 133052 0 0.0
.data 2048 2048 0 0.0
.text 950496 950496 0 0.0
BRD4161A+rpc (read/write) 1139916 1139916 0 0.0
.bss 149732 149732 0 0.0
.data 2260 2260 0 0.0
.text 987900 987900 0 0.0
BRD4161A+rs911x (read/write) 950840 950840 0 0.0
.bss 140776 140776 0 0.0
.data 2048 2048 0 0.0
.text 807996 807996 0 0.0
lock-app BRD4161A+wf200 (read/write) 1127228 1127228 0 0.0
.bss 144144 144144 0 0.0
.data 2056 2056 0 0.0
.text 981008 981008 0 0.0
window-app BRD4161A (read/write) 1079108 1079108 0 0.0
.bss 134524 134524 0 0.0
.data 2076 2076 0 0.0
.text 942488 942488 0 0.0
esp32 all-clusters-app c3devkit (read only) 1021374 1021372 -2 -0.0
(read/write) 1486042 1486042 0 0.0
.dram0.bss 70088 70088 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 215912 215912 0 0.0
.flash.text 1021374 1021372 -2 -0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1075171 1075171 0 0.0
(read/write) 488072 488072 0 0.0
.dram0.bss 75608 75608 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246324 246324 0 0.0
.flash.text 1069787 1069787 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 660176 660176 0 0.0
.bss 69548 69548 0 0.0
.data 1992 1992 0 0.0
.text 582836 582836 0 0.0
lock k32w061+release (read/write) 687148 687148 0 0.0
.bss 70012 70012 0 0.0
.data 2004 2004 0 0.0
.text 609332 609332 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10055644 10055644 0 0.0
(read/write) 694801 694801 0 0.0
.bss 42993 42993 0 0.0
.data 3304 3304 0 0.0
.data.rel.ro 630920 630920 0 0.0
.dynamic 528 528 0 0.0
.got 13656 13656 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 480028 480028 0 0.0
.text 7995252 7995252 0 0.0
thermostat-no-ble arm64 (read only) 2603180 2603180 0 0.0
(read/write) 158481 158481 0 0.0
.bss 65281 65281 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 83368 83368 0 0.0
.dynamic 528 528 0 0.0
.got 5104 5104 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 165748 165748 0 0.0
.text 2197136 2197136 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2448416 2448352 -64 -0.0
.bss 213948 213948 0 0.0
.data 5872 5872 0 0.0
.text 1411060 1410996 -64 -0.0
p6 all-clusters-app default (read only) 882128 882128 0 0.0
(read/write) 1685196 1685196 0 0.0
.bss 148568 148568 0 0.0
.data 2648 2648 0 0.0
.text 1525592 1525592 0 0.0
all-clusters-minimal-app default (read only) 882848 882848 0 0.0
(read/write) 1629324 1629324 0 0.0
.bss 147848 147848 0 0.0
.data 2648 2648 0 0.0
.text 1470440 1470440 0 0.0
light-app default (read only) 891152 891152 0 0.0
(read/write) 1549332 1549332 0 0.0
.bss 139752 139752 0 0.0
.data 2440 2440 0 0.0
.text 1398752 1398752 0 0.0
lock-app default (read only) 891280 891280 0 0.0
(read/write) 1576332 1576332 0 0.0
.bss 139608 139608 0 0.0
.data 2456 2456 0 0.0
.text 1425880 1425880 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 798212 798212 0 0.0
bss 70584 70584 0 0.0
noinit 40416 40416 0 0.0
text 566348 566348 0 0.0
lighting-app tlsr9518adk80d (read/write) 818260 818260 0 0.0
bss 71428 71428 0 0.0
noinit 40416 40416 0 0.0
text 582892 582894 2 0.0

@woody-apple woody-apple enabled auto-merge (squash) July 19, 2022 20:57
@woody-apple woody-apple merged commit 5eb84bc into project-chip:master Jul 19, 2022
github-actions bot pushed a commit that referenced this pull request Jul 20, 2022
@Damian-Nordic @web-flow
[nrfconnect] Fix handling Spake2+ salt in factory data script (#20924)
86065e2 
* [nrfconnect] Fix handling Spake2+ salt in factory data script

The script would take base64-encoded salt and pass it to
spake2p tool that expects an ascii string. It would generate
an incorrect Spake2+ verifier.

Signed-off-by: Damian Krolik <[email protected]>

* Fix and improve comments and help texts

Signed-off-by: Damian Krolik <[email protected]>

* Add unit tests

* Update spake2p tool to take base64 salt

* Fix typo
woody-apple added a commit that referenced this pull request Jul 20, 2022
@woody-apple @Damian-Nordic
[nrfconnect] Fix handling Spake2+ salt in factory data script (#20924) (
f34a18c 
#20972)

* [nrfconnect] Fix handling Spake2+ salt in factory data script

The script would take base64-encoded salt and pass it to
spake2p tool that expects an ascii string. It would generate
an incorrect Spake2+ verifier.

Signed-off-by: Damian Krolik <[email protected]>

* Fix and improve comments and help texts

Signed-off-by: Damian Krolik <[email protected]>

* Add unit tests

* Update spake2p tool to take base64 salt

* Fix typo

Co-authored-by: Damian Królik <[email protected]>
isiu-apple pushed a commit to isiu-apple/connectedhomeip that referenced this pull request Sep 16, 2022
@Damian-Nordic @isiu-apple
[nrfconnect] Fix handling Spake2+ salt in factory data script (projec…
cb7eb79 
…t-chip#20924)

* [nrfconnect] Fix handling Spake2+ salt in factory data script

The script would take base64-encoded salt and pass it to
spake2p tool that expects an ascii string. It would generate
an incorrect Spake2+ verifier.

Signed-off-by: Damian Krolik <[email protected]>

* Fix and improve comments and help texts

Signed-off-by: Damian Krolik <[email protected]>

* Add unit tests

* Update spake2p tool to take base64 salt

* Fix typo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kkasperczyk-no kkasperczyk-no Awaiting requested review from kkasperczyk-no

@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

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@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

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@msandstedt msandstedt Awaiting requested review from msandstedt

@rgoliver rgoliver Awaiting requested review from rgoliver

@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

@turon turon Awaiting requested review from turon

@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

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

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

Assignees
No one assigned
Labels
fast track github platform review - pending scripts tools workflows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Damian-Nordic @tcarmelveilleux @woody-apple