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

Allow null ICAC in AndroidDeviceControllerWrapper::AllocateNew #22458

Merged
merged 3 commits into from
Sep 8, 2022
Merged

Allow null ICAC in AndroidDeviceControllerWrapper::AllocateNew #22458

merged 3 commits into from
Sep 8, 2022

Conversation

tcarmelveilleux
Copy link
Contributor

@tcarmelveilleux tcarmelveilleux commented Sep 7, 2022 •
edited
Loading

Problem

  • Passing null for existing ICAC, when a NOC and RCAC were provided and desired to be used caused confusing behavior of NOC/RCAC being ignored and a completely different cert chain being generated.

Fixes #22455

Change overview

  • Add code to just use empty internal ICAC when null is provided in Java
  • Add log to tell users when an ephemeral NOC chain is generated.

Testing

  • CI still passes
  • Tested in unit/integration with our internal infrastructure that uses this API both with/without ICAC

@woody-apple woody-apple enabled auto-merge (squash) September 7, 2022 16:54
@github-actions
Copy link

github-actions bot commented Sep 7, 2022 •
edited
Loading

PR #22458: Size comparison from 383c416 to f6c46fd

Increases (9 builds for bl602, nrfconnect, psoc6, telink)
platform target config section 383c416 f6c46fd change % change
bl602 lighting-app bl602 .text 1065690 1065692 2 0.0
bl602+rpc .text 1097038 1097040 2 0.0
nrfconnect all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1160507 1160523 16 0.0
text 803552 803556 4 0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 26716599 26716601 2 0.0
all-clusters-minimal cy8ckit_062s2_43012 .debug_info 26453222 26453223 1 0.0
lock cy8ckit_062s2_43012 .debug_info 22295177 22295179 2 0.0
telink light-switch-app tlsr9518adk80d text 573710 573712 2 0.0
lighting-app tlsr9518adk80d text 591838 591842 4 0.0
ota-requestor-app tlsr9518adk80d text 598102 598104 2 0.0
Decreases (1 build for esp32)
platform target config section 383c416 f6c46fd change % change
esp32 all-clusters-app m5stack (read/write) 490860 490852 -8 -0.0
.flash.rodata 247400 247392 -8 -0.0
Full report (46 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 383c416 f6c46fd change % change
bl602 lighting-app bl602 (read/write) 1410290 1410290 0 0.0
.bss 121585 121585 0 0.0
.data 9816 9816 0 0.0
.text 1065690 1065692 2 0.0
bl602+rpc (read/write) 1455486 1455486 0 0.0
.bss 129017 129017 0 0.0
.data 10200 10200 0 0.0
.text 1097038 1097040 2 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 675431 675431 0 0.0
(read/write) 175976 175976 0 0.0
.bss 74300 74300 0 0.0
.data 3380 3380 0 0.0
.rodata 89223 89223 0 0.0
.text 585896 585896 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 640151 640151 0 0.0
(read/write) 157868 157868 0 0.0
.bss 73572 73572 0 0.0
.data 3380 3380 0 0.0
.rodata 78375 78375 0 0.0
.text 561456 561456 0 0.0
lock-ftd LP_CC2652R7 (read only) 676483 676483 0 0.0
(read/write) 165236 165236 0 0.0
.bss 71500 71500 0 0.0
.data 3304 3304 0 0.0
.rodata 77075 77075 0 0.0
.text 598928 598928 0 0.0
lock-mtd LP_CC2652R7 (read only) 659483 659483 0 0.0
(read/write) 177924 177924 0 0.0
.bss 67188 67188 0 0.0
.data 3304 3304 0 0.0
.rodata 102355 102355 0 0.0
.text 556648 556648 0 0.0
pump-app LP_CC2652R7 (read only) 685343 685343 0 0.0
(read/write) 157080 157080 0 0.0
.bss 71436 71436 0 0.0
.data 3296 3296 0 0.0
.rodata 90103 90103 0 0.0
.text 594756 594756 0 0.0
pump-controller-app LP_CC2652R7 (read only) 669835 669835 0 0.0
(read/write) 172700 172700 0 0.0
.bss 71548 71548 0 0.0
.data 3292 3292 0 0.0
.rodata 85659 85659 0 0.0
.text 583696 583696 0 0.0
shell LP_CC2652R7 (read only) 666090 666090 0 0.0
(read/write) 180836 180836 0 0.0
.bss 76620 76620 0 0.0
.data 3376 3376 0 0.0
.rodata 85778 85778 0 0.0
.text 579996 579996 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 587002 587002 0 0.0
.app_xip_area 463660 463660 0 0.0
.bss 65776 65776 0 0.0
.data 744 744 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 592738 592738 0 0.0
.app_xip_area 464612 464612 0 0.0
.bss 70560 70560 0 0.0
.data 748 748 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 599914 599914 0 0.0
.app_xip_area 477292 477292 0 0.0
.bss 65088 65088 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1108624 1108624 0 0.0
.bss 136332 136332 0 0.0
.data 2072 2072 0 0.0
.text 970200 970200 0 0.0
BRD4161A+rpc (read/write) 972316 972316 0 0.0
.bss 150844 150844 0 0.0
.data 2252 2252 0 0.0
.text 819200 819200 0 0.0
BRD4161A+rs911x (read/write) 1002056 1002056 0 0.0
.bss 169168 169168 0 0.0
.data 2064 2064 0 0.0
.text 830804 830804 0 0.0
lock-app BRD4161A+wf200 (read/write) 1150180 1150180 0 0.0
.bss 152248 152248 0 0.0
.data 2072 2072 0 0.0
.text 995840 995840 0 0.0
window-app BRD4161A (read/write) 1099856 1099856 0 0.0
.bss 137772 137772 0 0.0
.data 2096 2096 0 0.0
.text 959968 959968 0 0.0
esp32 all-clusters-app c3devkit (read only) 1033930 1033930 0 0.0
(read/write) 1493566 1493566 0 0.0
.dram0.bss 71120 71120 0 0.0
.dram0.data 13696 13696 0 0.0
.flash.rodata 218080 218080 0 0.0
.flash.text 1033930 1033930 0 0.0
.iram0.text 65204 65204 0 0.0
m5stack (read only) 1086511 1086511 0 0.0
(read/write) 490860 490852 -8 -0.0
.dram0.bss 76640 76640 0 0.0
.dram0.data 34152 34152 0 0.0
.flash.rodata 247400 247392 -8 -0.0
.flash.text 1081127 1081127 0 0.0
.iram0.text 123939 123939 0 0.0
k32w light k32w0+release (read/write) 648268 648268 0 0.0
.bss 70712 70712 0 0.0
.data 2068 2068 0 0.0
.text 572760 572760 0 0.0
lock k32w0+release (read/write) 705312 705312 0 0.0
.bss 71160 71160 0 0.0
.data 2076 2076 0 0.0
.text 629348 629348 0 0.0
linux all-clusters-app debug (read only) 3046537 3046537 0 0.0
(read/write) 156064 156064 0 0.0
.bss 61824 61824 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 85768 85768 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 1176 1176 0 0.0
.rodata 275659 275659 0 0.0
.text 2591442 2591442 0 0.0
all-clusters-minimal-app debug (read only) 2882401 2882401 0 0.0
(read/write) 147664 147664 0 0.0
.bss 61056 61056 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 78264 78264 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1160 1160 0 0.0
.rodata 275883 275883 0 0.0
.text 2429858 2429858 0 0.0
bridge-app debug+rpc (read only) 2380137 2380137 0 0.0
(read/write) 127752 127752 0 0.0
.bss 50656 50656 0 0.0
.data 3600 3600 0 0.0
.data.rel.ro 67640 67640 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 832 832 0 0.0
.rodata 204520 204520 0 0.0
.text 2012706 2012706 0 0.0
chip-tool debug (read only) 10956737 10956737 0 0.0
(read/write) 657736 657736 0 0.0
.bss 26072 26072 0 0.0
.data 2690 2690 0 0.0
.data.rel.ro 622456 622456 0 0.0
.dynamic 608 608 0 0.0
.got 5096 5096 0 0.0
.init 27 27 0 0.0
.init_array 776 776 0 0.0
.rodata 570293 570293 0 0.0
.text 8865220 8865220 0 0.0
chip-tool-ipv6only arm64 (read only) 10329660 10329660 0 0.0
(read/write) 705601 705601 0 0.0
.bss 33937 33937 0 0.0
.data 2856 2856 0 0.0
.data.rel.ro 649976 649976 0 0.0
.dynamic 560 560 0 0.0
.got 13864 13864 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 499948 499948 0 0.0
.text 8176692 8176692 0 0.0
lighting-app debug+rpc (read only) 2605529 2605529 0 0.0
(read/write) 130536 130536 0 0.0
.bss 49792 49792 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72680 72680 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 221328 221328 0 0.0
.text 2213010 2213010 0 0.0
lock-app debug (read only) 2588545 2588545 0 0.0
(read/write) 125712 125712 0 0.0
.bss 48288 48288 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69688 69688 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 904 904 0 0.0
.rodata 238352 238352 0 0.0
.text 2183250 2183250 0 0.0
ota-provider-app debug (read only) 2365801 2365801 0 0.0
(read/write) 119144 119144 0 0.0
.bss 47808 47808 0 0.0
.data 1936 1936 0 0.0
.data.rel.ro 63512 63512 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 768 768 0 0.0
.rodata 210328 210328 0 0.0
.text 1991714 1991714 0 0.0
ota-requestor-app debug (read only) 2531129 2531129 0 0.0
(read/write) 127552 127552 0 0.0
.bss 50368 50368 0 0.0
.data 2304 2304 0 0.0
.data.rel.ro 68920 68920 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 856 856 0 0.0
.rodata 217152 217152 0 0.0
.text 2141074 2141074 0 0.0
shell debug (read only) 2614873 2614873 0 0.0
(read/write) 142184 142184 0 0.0
.bss 57704 57704 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 77376 77376 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 1048 1048 0 0.0
.rodata 235794 235794 0 0.0
.text 2220370 2220370 0 0.0
thermostat-no-ble arm64 (read only) 2364244 2364244 0 0.0
(read/write) 141857 141857 0 0.0
.bss 55233 55233 0 0.0
.data 1680 1680 0 0.0
.data.rel.ro 76112 76112 0 0.0
.dynamic 560 560 0 0.0
.got 5056 5056 0 0.0
.init 24 24 0 0.0
.init_array 416 416 0 0.0
.rodata 141356 141356 0 0.0
.text 1984848 1984848 0 0.0
tv-app debug (read only) 3198753 3198753 0 0.0
(read/write) 258392 258392 0 0.0
.bss 168152 168152 0 0.0
.data 4144 4144 0 0.0
.data.rel.ro 79520 79520 0 0.0
.dynamic 608 608 0 0.0
.got 4856 4856 0 0.0
.init 27 27 0 0.0
.init_array 1080 1080 0 0.0
.rodata 260584 260584 0 0.0
.text 2747778 2747778 0 0.0
tv-casting-app debug (read only) 5516345 5516345 0 0.0
(read/write) 160888 160888 0 0.0
.bss 52120 52120 0 0.0
.data 1824 1824 0 0.0
.data.rel.ro 100488 100488 0 0.0
.dynamic 608 608 0 0.0
.got 4776 4776 0 0.0
.init 27 27 0 0.0
.init_array 1048 1048 0 0.0
.rodata 345969 345969 0 0.0
.text 4898066 4898066 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2455136 2455136 0 0.0
.bss 215044 215044 0 0.0
.data 5872 5872 0 0.0
.text 1417780 1417780 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1181327 1181327 0 0.0
bss 143641 143641 0 0.0
rodata 143584 143584 0 0.0
text 815164 815164 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1160507 1160523 16 0.0
bss 142868 142868 0 0.0
rodata 135172 135172 0 0.0
text 803552 803556 4 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841960 841960 0 0.0
(read/write) 1742572 1742572 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188720 188720 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1221517 1221517 0 0.0
.debug_aranges 111736 111736 0 0.0
.debug_frame 373008 373008 0 0.0
.debug_info 26716599 26716601 2 0.0
.debug_line 3657478 3657478 0 0.0
.debug_loc 3573505 3573505 0 0.0
.debug_ranges 338360 338360 0 0.0
.debug_str 3427479 3427479 0 0.0
.heap 841960 841960 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 570615 570615 0 0.0
.symtab 421488 421488 0 0.0
.text 0 0 0 0.0
1542800 1542800 0 0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 842696 842696 0 0.0
(read/write) 1685772 1685772 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187984 187984 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1213356 1213356 0 0.0
.debug_aranges 111208 111208 0 0.0
.debug_frame 376088 376088 0 0.0
.debug_info 26453222 26453223 1 0.0
.debug_line 3677994 3677994 0 0.0
.debug_loc 3561142 3561142 0 0.0
.debug_ranges 336976 336976 0 0.0
.debug_str 3416484 3416484 0 0.0
.heap 842696 842696 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 535089 535089 0 0.0
.symtab 408080 408080 0 0.0
.text 1486736 1486736 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 850928 850928 0 0.0
(read/write) 1603028 1603028 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 179960 179960 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2456 2456 0 0.0
.debug_abbrev 1048175 1048175 0 0.0
.debug_aranges 103384 103384 0 0.0
.debug_frame 346356 346356 0 0.0
.debug_info 21915392 21915392 0 0.0
.debug_line 3248459 3248459 0 0.0
.debug_loc 3259468 3259468 0 0.0
.debug_ranges 302448 302448 0 0.0
.debug_str 3221750 3221750 0 0.0
.heap 850928 850928 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 468388 468388 0 0.0
.symtab 375168 375168 0 0.0
.text 1412224 1412224 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 845896 845896 0 0.0
(read/write) 1640716 1640716 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 184976 184976 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2472 2472 0 0.0
.debug_abbrev 1055610 1055610 0 0.0
.debug_aranges 104056 104056 0 0.0
.debug_frame 349184 349184 0 0.0
.debug_info 22295177 22295179 2 0.0
.debug_line 3257280 3257280 0 0.0
.debug_loc 3299322 3299322 0 0.0
.debug_ranges 305792 305792 0 0.0
.debug_str 3249171 3249171 0 0.0
.heap 845896 845896 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 474591 474591 0 0.0
.symtab 378352 378352 0 0.0
.text 1444880 1444880 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1129284 1129284 0 0.0
.bss 106112 106112 0 0.0
.data 1028 1028 0 0.0
.text 576380 576380 0 0.0
lock-app qpg6105+debug (read/write) 1100264 1100264 0 0.0
.bss 102344 102344 0 0.0
.data 1032 1032 0 0.0
.text 547364 547364 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 812168 812168 0 0.0
bss 71372 71372 0 0.0
noinit 43488 43488 0 0.0
text 573710 573712 2 0.0
lighting-app tlsr9518adk80d (read/write) 834072 834072 0 0.0
bss 72228 72228 0 0.0
noinit 43488 43488 0 0.0
text 591838 591842 4 0.0
ota-requestor-app tlsr9518adk80d (read/write) 842316 842316 0 0.0
bss 73136 73136 0 0.0
noinit 43488 43488 0 0.0
text 598102 598104 2 0.0

@github-actions
Copy link

github-actions bot commented Sep 8, 2022 •
edited
Loading

PR #22458: Size comparison from b4505ac to 6146067

Decreases (4 builds for bl602, telink)
platform target config section b4505ac 6146067 change % change
bl602 lighting-app bl602 (read/write) 1410290 1410282 -8 -0.0
.text 1065690 1065688 -2 -0.0
telink light-switch-app tlsr9518adk80d text 573714 573712 -2 -0.0
lighting-app tlsr9518adk80d text 591842 591838 -4 -0.0
ota-requestor-app tlsr9518adk80d text 598104 598102 -2 -0.0
Full report (26 builds for bl602, cc13x2_26x2, efr32, k32w, linux, mbed, nrfconnect, qpg, telink)
platform target config section b4505ac 6146067 change % change
bl602 lighting-app bl602 (read/write) 1410290 1410282 -8 -0.0
.bss 121585 121585 0 0.0
.data 9816 9816 0 0.0
.text 1065690 1065688 -2 -0.0
bl602+rpc (read/write) 1455486 1455486 0 0.0
.bss 129017 129017 0 0.0
.data 10200 10200 0 0.0
.text 1097038 1097038 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 675431 675431 0 0.0
(read/write) 175976 175976 0 0.0
.bss 74300 74300 0 0.0
.data 3380 3380 0 0.0
.rodata 89223 89223 0 0.0
.text 585896 585896 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 640151 640151 0 0.0
(read/write) 157868 157868 0 0.0
.bss 73572 73572 0 0.0
.data 3380 3380 0 0.0
.rodata 78375 78375 0 0.0
.text 561456 561456 0 0.0
lock-ftd LP_CC2652R7 (read only) 676483 676483 0 0.0
(read/write) 165236 165236 0 0.0
.bss 71500 71500 0 0.0
.data 3304 3304 0 0.0
.rodata 77075 77075 0 0.0
.text 598928 598928 0 0.0
lock-mtd LP_CC2652R7 (read only) 659483 659483 0 0.0
(read/write) 177924 177924 0 0.0
.bss 67188 67188 0 0.0
.data 3304 3304 0 0.0
.rodata 102355 102355 0 0.0
.text 556648 556648 0 0.0
pump-app LP_CC2652R7 (read only) 685343 685343 0 0.0
(read/write) 157080 157080 0 0.0
.bss 71436 71436 0 0.0
.data 3296 3296 0 0.0
.rodata 90103 90103 0 0.0
.text 594756 594756 0 0.0
pump-controller-app LP_CC2652R7 (read only) 669835 669835 0 0.0
(read/write) 172700 172700 0 0.0
.bss 71548 71548 0 0.0
.data 3292 3292 0 0.0
.rodata 85659 85659 0 0.0
.text 583696 583696 0 0.0
shell LP_CC2652R7 (read only) 666090 666090 0 0.0
(read/write) 180836 180836 0 0.0
.bss 76620 76620 0 0.0
.data 3376 3376 0 0.0
.rodata 85778 85778 0 0.0
.text 579996 579996 0 0.0
efr32 lighting-app BRD4161A (read/write) 1108624 1108624 0 0.0
.bss 136332 136332 0 0.0
.data 2072 2072 0 0.0
.text 970200 970200 0 0.0
BRD4161A+rpc (read/write) 972316 972316 0 0.0
.bss 150844 150844 0 0.0
.data 2252 2252 0 0.0
.text 819200 819200 0 0.0
BRD4161A+rs911x (read/write) 1002056 1002056 0 0.0
.bss 169168 169168 0 0.0
.data 2064 2064 0 0.0
.text 830804 830804 0 0.0
lock-app BRD4161A+wf200 (read/write) 1150180 1150180 0 0.0
.bss 152248 152248 0 0.0
.data 2072 2072 0 0.0
.text 995840 995840 0 0.0
window-app BRD4161A (read/write) 1099856 1099856 0 0.0
.bss 137772 137772 0 0.0
.data 2096 2096 0 0.0
.text 959968 959968 0 0.0
k32w light k32w0+release (read/write) 648268 648268 0 0.0
.bss 70712 70712 0 0.0
.data 2068 2068 0 0.0
.text 572760 572760 0 0.0
lock k32w0+release (read/write) 705312 705312 0 0.0
.bss 71160 71160 0 0.0
.data 2076 2076 0 0.0
.text 629348 629348 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10329660 10329660 0 0.0
(read/write) 705601 705601 0 0.0
.bss 33937 33937 0 0.0
.data 2856 2856 0 0.0
.data.rel.ro 649976 649976 0 0.0
.dynamic 560 560 0 0.0
.got 13864 13864 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 499948 499948 0 0.0
.text 8176692 8176692 0 0.0
thermostat-no-ble arm64 (read only) 2364244 2364244 0 0.0
(read/write) 141857 141857 0 0.0
.bss 55233 55233 0 0.0
.data 1680 1680 0 0.0
.data.rel.ro 76112 76112 0 0.0
.dynamic 560 560 0 0.0
.got 5056 5056 0 0.0
.init 24 24 0 0.0
.init_array 416 416 0 0.0
.rodata 141356 141356 0 0.0
.text 1984848 1984848 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2455136 2455136 0 0.0
.bss 215044 215044 0 0.0
.data 5872 5872 0 0.0
.text 1417780 1417780 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1181327 1181327 0 0.0
bss 143641 143641 0 0.0
rodata 143584 143584 0 0.0
text 815164 815164 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1160523 1160523 0 0.0
bss 142868 142868 0 0.0
rodata 135172 135172 0 0.0
text 803556 803556 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1129284 1129284 0 0.0
.bss 106112 106112 0 0.0
.data 1028 1028 0 0.0
.text 576380 576380 0 0.0
lock-app qpg6105+debug (read/write) 1100264 1100264 0 0.0
.bss 102344 102344 0 0.0
.data 1032 1032 0 0.0
.text 547364 547364 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 812168 812168 0 0.0
bss 71372 71372 0 0.0
noinit 43488 43488 0 0.0
text 573714 573712 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 834072 834072 0 0.0
bss 72228 72228 0 0.0
noinit 43488 43488 0 0.0
text 591842 591838 -4 -0.0
ota-requestor-app tlsr9518adk80d (read/write) 842316 842316 0 0.0
bss 73136 73136 0 0.0
noinit 43488 43488 0 0.0
text 598104 598102 -2 -0.0

@tcarmelveilleux @woody-apple
Allow null ICAC in AndroidDeviceControllerWrapper::AllocateNew
80669af 
- Passing null for existing ICAC, when a NOC and RCAC were provided and desired to
  be used casued confusing behavior of NOC/RCAC being ignored and a completely
  different cert chain being generated.

Fixes project-chip#22455

Changes done:
- Add code to just use empty internal ICAC when null is provided in Java
- Add log to tell users when an ephemeral NOC chain is generated.

Testing done:
- CI still passes
- Tested in unit/integration with our internal infrastructure that uses this API
  both with/without ICAC
@tcarmelveilleux @woody-apple
Restyled
ef8b4fd
@tcarmelveilleux @woody-apple
Fix CI
844d868
@woody-apple woody-apple force-pushed the fix-icac-missing-android branch from 6146067 to 844d868 Compare September 8, 2022 02:58
@github-actions
Copy link

github-actions bot commented Sep 8, 2022 •
edited
Loading

PR #22458: Size comparison from e1966f5 to 844d868

Increases (8 builds for bl602, cc13x2_26x2, esp32, telink)
platform target config section e1966f5 844d868 change % change
bl602 lighting-app bl602 (read/write) 1410282 1410290 8 0.0
.text 1065688 1065690 2 0.0
bl602+rpc .text 1097038 1097040 2 0.0
cc13x2_26x2 lock-ftd LP_CC2652R7 (read only) 676475 676483 8 0.0
.text 598920 598928 8 0.0
pump-controller-app LP_CC2652R7 (read/write) 172700 172708 8 0.0
esp32 all-clusters-app c3devkit (read only) 1033928 1033930 2 0.0
.flash.text 1033928 1033930 2 0.0
telink light-switch-app tlsr9518adk80d text 573710 573712 2 0.0
lighting-app tlsr9518adk80d text 591838 591840 2 0.0
ota-requestor-app tlsr9518adk80d text 598102 598104 2 0.0
Decreases (3 builds for cc13x2_26x2, psoc6)
platform target config section e1966f5 844d868 change % change
cc13x2_26x2 lock-ftd LP_CC2652R7 (read/write) 165244 165236 -8 -0.0
pump-controller-app LP_CC2652R7 (read only) 669835 669827 -8 -0.0
.text 583696 583688 -8 -0.0
psoc6 light cy8ckit_062s2_43012 .debug_info 21915393 21915392 -1 -0.0
Full report (35 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section e1966f5 844d868 change % change
bl602 lighting-app bl602 (read/write) 1410282 1410290 8 0.0
.bss 121585 121585 0 0.0
.data 9816 9816 0 0.0
.text 1065688 1065690 2 0.0
bl602+rpc (read/write) 1455486 1455486 0 0.0
.bss 129017 129017 0 0.0
.data 10200 10200 0 0.0
.text 1097038 1097040 2 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 675431 675431 0 0.0
(read/write) 175976 175976 0 0.0
.bss 74300 74300 0 0.0
.data 3380 3380 0 0.0
.rodata 89223 89223 0 0.0
.text 585896 585896 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 640151 640151 0 0.0
(read/write) 157868 157868 0 0.0
.bss 73572 73572 0 0.0
.data 3380 3380 0 0.0
.rodata 78375 78375 0 0.0
.text 561456 561456 0 0.0
lock-ftd LP_CC2652R7 (read only) 676475 676483 8 0.0
(read/write) 165244 165236 -8 -0.0
.bss 71500 71500 0 0.0
.data 3304 3304 0 0.0
.rodata 77075 77075 0 0.0
.text 598920 598928 8 0.0
lock-mtd LP_CC2652R7 (read only) 659483 659483 0 0.0
(read/write) 177924 177924 0 0.0
.bss 67188 67188 0 0.0
.data 3304 3304 0 0.0
.rodata 102355 102355 0 0.0
.text 556648 556648 0 0.0
pump-app LP_CC2652R7 (read only) 685343 685343 0 0.0
(read/write) 157080 157080 0 0.0
.bss 71436 71436 0 0.0
.data 3296 3296 0 0.0
.rodata 90103 90103 0 0.0
.text 594756 594756 0 0.0
pump-controller-app LP_CC2652R7 (read only) 669835 669827 -8 -0.0
(read/write) 172700 172708 8 0.0
.bss 71548 71548 0 0.0
.data 3292 3292 0 0.0
.rodata 85659 85659 0 0.0
.text 583696 583688 -8 -0.0
shell LP_CC2652R7 (read only) 666090 666090 0 0.0
(read/write) 180836 180836 0 0.0
.bss 76620 76620 0 0.0
.data 3376 3376 0 0.0
.rodata 85778 85778 0 0.0
.text 579996 579996 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 587002 587002 0 0.0
.app_xip_area 463660 463660 0 0.0
.bss 65776 65776 0 0.0
.data 744 744 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 592738 592738 0 0.0
.app_xip_area 464612 464612 0 0.0
.bss 70560 70560 0 0.0
.data 748 748 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 599914 599914 0 0.0
.app_xip_area 477292 477292 0 0.0
.bss 65088 65088 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1108624 1108624 0 0.0
.bss 136332 136332 0 0.0
.data 2072 2072 0 0.0
.text 970200 970200 0 0.0
BRD4161A+rpc (read/write) 972316 972316 0 0.0
.bss 150844 150844 0 0.0
.data 2252 2252 0 0.0
.text 819200 819200 0 0.0
BRD4161A+rs911x (read/write) 1002056 1002056 0 0.0
.bss 169168 169168 0 0.0
.data 2064 2064 0 0.0
.text 830804 830804 0 0.0
lock-app BRD4161A+wf200 (read/write) 1150180 1150180 0 0.0
.bss 152248 152248 0 0.0
.data 2072 2072 0 0.0
.text 995840 995840 0 0.0
window-app BRD4161A (read/write) 1099856 1099856 0 0.0
.bss 137772 137772 0 0.0
.data 2096 2096 0 0.0
.text 959968 959968 0 0.0
esp32 all-clusters-app c3devkit (read only) 1033928 1033930 2 0.0
(read/write) 1493566 1493566 0 0.0
.dram0.bss 71120 71120 0 0.0
.dram0.data 13696 13696 0 0.0
.flash.rodata 218080 218080 0 0.0
.flash.text 1033928 1033930 2 0.0
.iram0.text 65204 65204 0 0.0
m5stack (read only) 1086511 1086511 0 0.0
(read/write) 490852 490852 0 0.0
.dram0.bss 76640 76640 0 0.0
.dram0.data 34152 34152 0 0.0
.flash.rodata 247392 247392 0 0.0
.flash.text 1081127 1081127 0 0.0
.iram0.text 123939 123939 0 0.0
k32w light k32w0+release (read/write) 648268 648268 0 0.0
.bss 70712 70712 0 0.0
.data 2068 2068 0 0.0
.text 572760 572760 0 0.0
lock k32w0+release (read/write) 705312 705312 0 0.0
.bss 71160 71160 0 0.0
.data 2076 2076 0 0.0
.text 629348 629348 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10329660 10329660 0 0.0
(read/write) 705601 705601 0 0.0
.bss 33937 33937 0 0.0
.data 2856 2856 0 0.0
.data.rel.ro 649976 649976 0 0.0
.dynamic 560 560 0 0.0
.got 13864 13864 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 499948 499948 0 0.0
.text 8176692 8176692 0 0.0
thermostat-no-ble arm64 (read only) 2364244 2364244 0 0.0
(read/write) 141857 141857 0 0.0
.bss 55233 55233 0 0.0
.data 1680 1680 0 0.0
.data.rel.ro 76112 76112 0 0.0
.dynamic 560 560 0 0.0
.got 5056 5056 0 0.0
.init 24 24 0 0.0
.init_array 416 416 0 0.0
.rodata 141356 141356 0 0.0
.text 1984848 1984848 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2455136 2455136 0 0.0
.bss 215044 215044 0 0.0
.data 5872 5872 0 0.0
.text 1417780 1417780 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1181327 1181327 0 0.0
bss 143641 143641 0 0.0
rodata 143584 143584 0 0.0
text 815164 815164 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1160523 1160523 0 0.0
bss 142868 142868 0 0.0
rodata 135172 135172 0 0.0
text 803556 803556 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841960 841960 0 0.0
(read/write) 1742572 1742572 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188720 188720 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1221517 1221517 0 0.0
.debug_aranges 111736 111736 0 0.0
.debug_frame 373008 373008 0 0.0
.debug_info 26716600 26716600 0 0.0
.debug_line 3657478 3657478 0 0.0
.debug_loc 3573505 3573505 0 0.0
.debug_ranges 338360 338360 0 0.0
.debug_str 3427479 3427479 0 0.0
.heap 841960 841960 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 570615 570615 0 0.0
.symtab 421488 421488 0 0.0
.text 1542800 1542800 0 0.0
.zero.table 8 8 0 0.0
text 0 0 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 842696 842696 0 0.0
(read/write) 1685772 1685772 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187984 187984 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1213356 1213356 0 0.0
.debug_aranges 111208 111208 0 0.0
.debug_frame 376088 376088 0 0.0
.debug_info 26453223 26453223 0 0.0
.debug_line 3677994 3677994 0 0.0
.debug_loc 3561142 3561142 0 0.0
.debug_ranges 336976 336976 0 0.0
.debug_str 3416484 3416484 0 0.0
.heap 842696 842696 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 535089 535089 0 0.0
.symtab 408080 408080 0 0.0
.text 1486736 1486736 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 850928 850928 0 0.0
(read/write) 1603028 1603028 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 179960 179960 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2456 2456 0 0.0
.debug_abbrev 1048175 1048175 0 0.0
.debug_aranges 103384 103384 0 0.0
.debug_frame 346356 346356 0 0.0
.debug_info 21915393 21915392 -1 -0.0
.debug_line 3248459 3248459 0 0.0
.debug_loc 3259468 3259468 0 0.0
.debug_ranges 302448 302448 0 0.0
.debug_str 3221750 3221750 0 0.0
.heap 850928 850928 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 468388 468388 0 0.0
.symtab 375168 375168 0 0.0
.text 1412224 1412224 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 845896 845896 0 0.0
(read/write) 1640716 1640716 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 184976 184976 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2472 2472 0 0.0
.debug_abbrev 1055610 1055610 0 0.0
.debug_aranges 104056 104056 0 0.0
.debug_frame 349184 349184 0 0.0
.debug_info 22295178 22295178 0 0.0
.debug_line 3257280 3257280 0 0.0
.debug_loc 3299322 3299322 0 0.0
.debug_ranges 305792 305792 0 0.0
.debug_str 3249171 3249171 0 0.0
.heap 845896 845896 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 474591 474591 0 0.0
.symtab 378352 378352 0 0.0
.text 1444880 1444880 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1129284 1129284 0 0.0
.bss 106112 106112 0 0.0
.data 1028 1028 0 0.0
.text 576380 576380 0 0.0
lock-app qpg6105+debug (read/write) 1100264 1100264 0 0.0
.bss 102344 102344 0 0.0
.data 1032 1032 0 0.0
.text 547364 547364 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 812168 812168 0 0.0
bss 71372 71372 0 0.0
noinit 43488 43488 0 0.0
text 573710 573712 2 0.0
lighting-app tlsr9518adk80d (read/write) 834072 834072 0 0.0
bss 72228 72228 0 0.0
noinit 43488 43488 0 0.0
text 591838 591840 2 0.0
ota-requestor-app tlsr9518adk80d (read/write) 842316 842316 0 0.0
bss 73136 73136 0 0.0
noinit 43488 43488 0 0.0
text 598102 598104 2 0.0

@woody-apple woody-apple merged commit ac30d99 into project-chip:master Sep 8, 2022
isiu-apple pushed a commit to isiu-apple/connectedhomeip that referenced this pull request Sep 16, 2022
@tcarmelveilleux @isiu-apple
Allow null ICAC in AndroidDeviceControllerWrapper::AllocateNew (pro…
d789d9b 
…ject-chip#22458)

* Allow null ICAC in `AndroidDeviceControllerWrapper::AllocateNew`

- Passing null for existing ICAC, when a NOC and RCAC were provided and desired to
  be used casued confusing behavior of NOC/RCAC being ignored and a completely
  different cert chain being generated.

Fixes project-chip#22455

Changes done:
- Add code to just use empty internal ICAC when null is provided in Java
- Add log to tell users when an ephemeral NOC chain is generated.

Testing done:
- CI still passes
- Tested in unit/integration with our internal infrastructure that uses this API
  both with/without ICAC

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

@andy31415 andy31415 andy31415 approved these changes

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

@emargolis emargolis emargolis 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

@mspang mspang Awaiting requested review from mspang

@rgoliver rgoliver Awaiting requested review from rgoliver

@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

@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

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

Successfully merging this pull request may close these issues.

[1.0] Missing ICAC at wrapper init can cause unexpected NOC chain generation on Android
4 participants
@tcarmelveilleux @andy31415 @emargolis @woody-apple