Merge branch 'master' into basic-attrs

And ZAP regen.
project-chip · Feb 1, 2022 · 4e79ddf · 4e79ddf
2 parents ebadcb6 + cb9b046
commit 4e79ddf
Show file tree

Hide file tree

Showing 447 changed files with 14,473 additions and 35,862 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,7 +3,6 @@
 # Same for files in zap-generated folders
 **/zap-generated/** linguist-generated
 # And some specific generated files
-src/controller/python/chip/clusters/CHIPClusters.cpp linguist-generated
 src/controller/python/chip/clusters/CHIPClusters.py linguist-generated
 src/controller/python/chip/clusters/Objects.py linguist-generated
 src/darwin/Framework/CHIPTests/CHIPClustersTests.m linguist-generated
diff --git a/.github/workflows/examples-cyw30739.yaml b/.github/workflows/examples-cyw30739.yaml
@@ -57,12 +57,12 @@ jobs:
                   path: |
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
-            - name: Build example CYW30739 Lighting App
-              timeout-minutes: 10
+            - name: Build example CYW30739 Apps
+              timeout-minutes: 30
               run: |
                   ./scripts/run_in_build_env.sh \
                     "./scripts/build/build_examples.py \
-                      --target cyw30739-cyw930739m2evb_01-light \
+                      --target-glob 'cyw30739-cyw930739m2evb_01-{light,lock,ota-requestor}' \
                       build \
                       --copy-artifacts-to out/artifacts \
                     "
@@ -73,12 +73,20 @@ jobs:
                     cyw30739 cyw930739m2evb_01 light \
                     out/artifacts/cyw30739-cyw930739m2evb_01-light/chip-cyw30739-lighting-example.elf \
                     /tmp/bloat_reports/
-            - name: Build example CYW30739 Lock App
-              timeout-minutes: 10
+            - name: Get lock size stats
+              timeout-minutes: 5
               run: |
-                  scripts/examples/gn_build_example.sh examples/lock-app/cyw30739 out/lock_app
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py cyw30739 CYW30739 lock-app \
-                    out/lock_app/chip-cyw30739-lock-example.elf /tmp/bloat_reports/
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    cyw30739 cyw930739m2evb_01 lock \
+                    out/artifacts/cyw30739-cyw930739m2evb_01-lock/chip-cyw30739-lock-example.elf \
+                    /tmp/bloat_reports/
+            - name: Get ota-requestor size stats
+              timeout-minutes: 5
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    cyw30739 cyw930739m2evb_01 ota-requestor \
+                    out/artifacts/cyw30739-cyw930739m2evb_01-ota-requestor/chip-cyw30739-ota-requestor-example.elf \
+                    /tmp/bloat_reports/
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

diff --git a/config/android/CHIPProjectConfig.h b/config/android/CHIPProjectConfig.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020-2021 Project CHIP Authors
+ *    Copyright (c) 2020-2022 Project CHIP Authors
  *    Copyright (c) 2016-2017 Nest Labs, Inc.
  *    Copyright (c) 2019-2020 Google LLC.
  *    All rights reserved.
@@ -34,16 +34,9 @@
 
 #define INET_CONFIG_OVERRIDE_SYSTEM_TCP_USER_TIMEOUT 0
 
-// Enable passcode encryption configuration 1
-#define CHIP_CONFIG_SUPPORT_PASSCODE_CONFIG1_TEST_ONLY 1
-
 // Uncomment this for a large Tunnel MTU.
 //#define CHIP_CONFIG_TUNNEL_INTERFACE_MTU                           (9000)
 
-#define CHIP_CONFIG_LEGACY_CASE_AUTH_DELEGATE 0
-
-#define CHIP_CONFIG_LEGACY_KEY_EXPORT_DELEGATE 0
-
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 300
 
 #define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1

diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2020 Project CHIP Authors
+#    Copyright (c) 2020-2022 Project CHIP Authors
 #    Copyright (c) 2018 Nest Labs, Inc.
 #    All rights reserved.
 #
@@ -166,125 +166,6 @@ menu "CHIP Core"
             help
                 The maximum number of simultaneously active session keys.
 
-        config DEFAULT_SECURITY_SESSION_ESTABLISHMENT_TIMEOUT
-            int "Default Security Session Establishment Timeout (ms)"
-            range 0 65535
-            default 30000
-            help
-                The default amount of time, in milliseconds, after which an in-progess
-                session establishment will fail due to a timeout.
-
-                This value can be overridden by the application at runtime.
-
-        config DEFAULT_SECURITY_SESSION_IDLE_TIMEOUT
-            int "Default Security Session Idle Timeout (ms)"
-            range 0 65535
-            default 15000
-            help
-                The default minimum amount of time, in milliseconds, that an unreserved
-                and idle security session will be allowed to exist before being destroyed.
-                In practice, unreserved idle sessions can exist for up to twice this value.
-
-                This value can be overridden by the application at runtime.
-
-        menu "Protocols"
-
-            config ENABLE_PASE_INITIATOR
-                bool "Enable PASE Initiator"
-                default n
-                help
-                    Enable support for initiating PASE security sessions with a remote node.
-
-                    This feature is rarely needed in device applications of CHIP.
-
-                    (PASE = Password Authenticated Session Establishment).
-
-            config ENABLE_PASE_RESPONDER
-                bool "Enable PASE Responder"
-                default y
-                help
-                    Enable support for responding to a request from a remote node to initiate
-                    a PASE security session.
-
-                    This feature is necessary to support standard CHIP pairing.
-
-                    (PASE = Password Authenticated Session Establishment).
-
-            config ENABLE_CASE_INITIATOR
-                bool "Enable CASE Initiator"
-                default y
-                help
-                    Enable support for initiating CASE security sessions with a remote node.
-
-                    This feature is necessary to support interacting with CHIP cloud services.
-
-                    (CASE = Certificate Authenticated Session Establishment).
-
-            config ENABLE_CASE_RESPONDER
-                bool "Enable CASE Responder"
-                default y
-                help
-                    Enable support for responding to a request from a remote note to initiate
-                    a CASE security session.
-
-                    This feature is necessary to support standard CHIP pairing.
-
-                    (CASE = Certificate Authenticated Session Establishment).
-
-        endmenu # "Protocols"
-
-        menu "Group Keys"
-
-            config USE_APP_GROUP_KEYS_FOR_MSG_ENC
-                bool "Enable Group Keys for CHIP Message Encryption"
-                default y
-                help
-                    Enable the use of application group keys for CHIP message encryption.
-
-            config MAX_CACHED_MSG_ENC_APP_KEYS
-                int "Group Key Cache Size"
-                range 0 255
-                default 5
-                depends on USE_APP_GROUP_KEYS_FOR_MSG_ENC
-                help
-                    The size of the cache (in number of keys) used to store derived application
-                    group encryption keys.
-
-                    This value is only meaningful when group keys are enabled for CHIP message
-                    encryption.
-
-            config MAX_APPLICATION_EPOCH_KEYS
-                int "Max Application Epoch Keys"
-                range 0 8
-                default 4
-                help
-                    The maximum number of simultaneously supported application epoch keys.
-
-                    (Epoch keys are a kind of symmetric key that gets mixed together with
-                    other key material to form a group encryption key which can be used
-                    for private communication amongst a set of related CHIP nodes).
-
-                    This value should be set to the maximum number of epoch keys that
-                    can be simultaneously provisioned on the local CHIP node.  The
-                    maximum supported value is 8, however, in most cases only two such
-                    keys will exist at any given point in time.
-
-            config MAX_APPLICATION_GROUPS
-                int "Max Application Master Keys"
-                range 0 255
-                default 4
-                help
-                    The maximum number of simultaneously supported application group master keys.
-
-                    (Application group master keys are a kind of symmetric key that gets mixed
-                    together with other key material to form a group encryption key which can
-                    be used for private communication amongst a set of related CHIP nodes).
-
-                    This value should be set to the number of CHIP application groups
-                    in which the local CHIP device will be a member.
-
-        endmenu # "Group Keys"
-
         menu "Debugging"
 
             config SECURITY_TEST_MODE
@@ -307,12 +188,6 @@ menu "CHIP Core"
                     WARNING: This option makes it possible to circumvent basic CHIP security functionality.
                     Because of this it SHOULD NEVER BE ENABLED IN PRODUCTION BUILDS.
 
-            config DEBUG_CERT_VALIDATION
-                bool "Enable Certificate Validation Debugging"
-                default n
-                help
-                    Enable support for debugging output from certificate validation.
-
         endmenu # "Debugging"
 
     endmenu # "Security Options"
@@ -753,6 +628,40 @@ menu "CHIP Device Layer"
 
                 This option is for testing only and should not be enabled in production releases.
 
+        config USE_TEST_SPAKE2P_ITERATION_COUNT
+            int "Use Test Spake2p Iteration Count"
+            range 0 100000
+            default 1000
+            help
+                Specifies a hard-coded spake2p iteration count to be used if none is found in CHIP NV storage.
+                Setting the value to 0 disables the feature.
+
+                Note that any decimal integer number between 1000 and 100000 can be used here.
+
+                This option is for testing only and should not be enabled in production releases.
+
+        config USE_TEST_SPAKE2P_SALT
+            string "Use Test Spake2p Salt"
+            default "{ 0x53, 0x50, 0x41, 0x4B, 0x45, 0x32, 0x50, 0x20, 0x4B, 0x65, 0x79, 0x20, 0x53, 0x61, 0x6C, 0x74 }"
+            help
+                Specifies a hard-coded spake2p salt to be used if none is found in CHIP NV storage.
+                Setting the value to 0 disables the feature.
+
+                Note that any string representing hexadecimal array from 16 up to 32 bytes can be used here.
+
+                This option is for testing only and should not be enabled in production releases.
+
+        config USE_TEST_SPAKE2P_VERIFIER
+            string "Use Test Spake2p Verifier"
+            default "{ 0xab, 0xa6, 0x0c, 0x30, 0x41, 0x6b, 0x8f, 0x41, 0x77, 0xf5, 0xe1, 0x6a, 0xd5, 0x14, 0xcf, 0xd9, 0x57, 0x75, 0x13, 0xf0, 0x2f, 0xd6, 0x05, 0x06, 0xb1, 0x04, 0x9d, 0x0f, 0x2c, 0x73, 0x10, 0x01, 0x0e, 0x5e, 0x40, 0xbf, 0xd8, 0x6b, 0x4e, 0xf6, 0x81, 0xa8, 0x8b, 0x71, 0xe9, 0xe2, 0xa8, 0x53, 0x98, 0x5a, 0x7d, 0xef, 0x91, 0x6e, 0xa3, 0x0e, 0x01, 0xb8, 0x72, 0x2f, 0xbf, 0x7d, 0x0e, 0x38, 0x85, 0x6c, 0x12, 0xcd, 0x64, 0xc2, 0x25, 0xbb, 0x24, 0xef, 0x21, 0x41, 0x7e, 0x0e, 0x44, 0xe5 }"
+            help
+                Specifies a hard-coded spake2p verifier to be used if none is found in CHIP NV storage.
+                Setting the value to 0 disables the feature.
+
+                Note that any string representing hexadecimal array of 80 bytes can be used here.
+
+                This option is for testing only and should not be enabled in production releases.
+
         config ENABLE_FIXED_TUNNEL_SERVER
             bool "Use Fixed Tunnel Server"
             default n

diff --git a/config/ios/CHIPProjectConfig.h b/config/ios/CHIPProjectConfig.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020-2021 Project CHIP Authors
+ *    Copyright (c) 2020-2022 Project CHIP Authors
  *    Copyright (c) 2016-2017 Nest Labs, Inc.
  *    Copyright (c) 2019-2020 Google LLC.
  *    All rights reserved.
@@ -34,16 +34,9 @@
 
 #define INET_CONFIG_OVERRIDE_SYSTEM_TCP_USER_TIMEOUT 0
 
-// Enable passcode encryption configuration 1
-#define CHIP_CONFIG_SUPPORT_PASSCODE_CONFIG1_TEST_ONLY 1
-
 // Uncomment this for a large Tunnel MTU.
 //#define CHIP_CONFIG_TUNNEL_INTERFACE_MTU                           (9000)
 
-#define CHIP_CONFIG_LEGACY_CASE_AUTH_DELEGATE 0
-
-#define CHIP_CONFIG_LEGACY_KEY_EXPORT_DELEGATE 0
-
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 300
 
 #define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1

diff --git a/config/mbed/CMakeLists.txt b/config/mbed/CMakeLists.txt
@@ -463,7 +463,6 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
 
     target_sources(${APP_TARGET} PRIVATE
         ${CHIP_ROOT}/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp
-        ${CHIP_ROOT}/zzz_generated/ota-requestor-app/zap-generated/CHIPClusters.cpp
         ${CHIP_ROOT}/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp
 
         ${CHIP_ROOT}/src/app/clusters/ota-requestor/OTARequestor.cpp

diff --git a/config/python/CHIPProjectConfig.h b/config/python/CHIPProjectConfig.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020-2021 Project CHIP Authors
+ *    Copyright (c) 2020-2022 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -53,15 +53,8 @@
 #define CHIP_CONFIG_SECURITY_TEST_MODE 0
 #define CHIP_CONFIG_REQUIRE_AUTH 1
 
-// Increase session idle timeout in stand-alone builds for the convenience of developers.
-#define CHIP_CONFIG_DEFAULT_SECURITY_SESSION_IDLE_TIMEOUT 120000
-
 #define CHIP_CONFIG_ENABLE_UPDATE 1
 
-#define CHIP_CONFIG_LEGACY_CASE_AUTH_DELEGATE 0
-
-#define CHIP_CONFIG_LEGACY_KEY_EXPORT_DELEGATE 0
-
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
 
 #define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1

diff --git a/config/standalone/CHIPProjectConfig.h b/config/standalone/CHIPProjectConfig.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020-2021 Project CHIP Authors
+ *    Copyright (c) 2020-2022 Project CHIP Authors
  *    Copyright (c) 2016-2017 Nest Labs, Inc.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,6 +39,14 @@
 // Use a default pairing code if one hasn't been provisioned in flash.
 #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
 #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
+#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_ITERATION_COUNT 1000
+#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_SALT                                                                                   \
+    "{ 0x53, 0x50, 0x41, 0x4B, 0x45, 0x32, 0x50, 0x20, 0x4B, 0x65, 0x79, 0x20, 0x53, 0x61, 0x6C, 0x74 }"
+#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_VERIFIER                                                                               \
+    "{ 0xab, 0xa6, 0x0c, 0x30, 0x41, 0x6b, 0x8f, 0x41, 0x77, 0xf5, 0xe1, 0x6a, 0xd5, 0x14, 0xcf, 0xd9, 0x57, 0x75, 0x13, 0xf0, 0x2f,  \
+        0xd6, 0x05, 0x06, 0xb1, 0x04, 0x9d, 0x0f, 0x2c, 0x73, 0x10, 0x01, 0x0e, 0x5e, 0x40, 0xbf, 0xd8, 0x6b, 0x4e, 0xf6, 0x81,    \
+        0xa8, 0x8b, 0x71, 0xe9, 0xe2, 0xa8, 0x53, 0x98, 0x5a, 0x7d, 0xef, 0x91, 0x6e, 0xa3, 0x0e, 0x01, 0xb8, 0x72, 0x2f, 0xbf,    \
+        0x7d, 0x0e, 0x38, 0x85, 0x6c, 0x12, 0xcd, 0x64, 0xc2, 0x25, 0xbb, 0x24, 0xef, 0x21, 0x41, 0x7e, 0x0e, 0x44, 0xe5 }"
 
 // Enable reading DRBG seed data from /dev/(u)random.
 // This is needed for test applications and the CHIP device manager to function
@@ -56,15 +64,8 @@
 #define CHIP_CONFIG_SECURITY_TEST_MODE 0
 #define CHIP_CONFIG_REQUIRE_AUTH 1
 
-// Increase session idle timeout in stand-alone builds for the convenience of developers.
-#define CHIP_CONFIG_DEFAULT_SECURITY_SESSION_IDLE_TIMEOUT 120000
-
 #define CHIP_CONFIG_ENABLE_UPDATE 1
 
-#define CHIP_CONFIG_LEGACY_CASE_AUTH_DELEGATE 0
-
-#define CHIP_CONFIG_LEGACY_KEY_EXPORT_DELEGATE 0
-
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
 
 #define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1