Merge branch 'master' into feature/adds-psa-crypto-support

Author: rosahay-silabs

credentials/generate-revocation-set.py

@@ -32,6 +32,7 @@
 from click_option_group import RequiredMutuallyExclusiveOptionGroup, optgroup
 from cryptography import x509
 from cryptography.hazmat.primitives.asymmetric import ec
+from cryptography.x509.oid import NameOID
 
 # Supported log levels, mapping string values required for argument
 # parsing into logging constants
@@ -64,6 +65,32 @@ def extract_single_integer_attribute(subject, oid):
     return None
 
 
+def extract_fallback_tag_from_common_name(cn, marker):
+    val_len = 4
+    start_idx = cn.find(marker)
+
+    if start_idx != -1:
+        val_start_idx = start_idx + len(marker)
+        val = cn[val_start_idx:val_start_idx + val_len]
+        return int(val, 16) if len(val) == 4 else None
+
+    return None
+
+
+def parse_vid_pid_from_distinguished_name(distinguished_name):
+    # VID/PID encoded using Matter specific RDNs
+    vid = extract_single_integer_attribute(distinguished_name, OID_VENDOR_ID)
+    pid = extract_single_integer_attribute(distinguished_name, OID_PRODUCT_ID)
+
+    # Fallback method to get the VID/PID, encoded in CN as "Mvid:FFFF Mpid:1234"
+    if vid is None and pid is None:
+        cn = distinguished_name.get_attributes_for_oid(NameOID.COMMON_NAME)[0].value
+        vid = extract_fallback_tag_from_common_name(cn, 'Mvid:')
+        pid = extract_fallback_tag_from_common_name(cn, 'Mpid:')
+
+    return vid, pid
+
+
 class DCLDClient:
     '''
     A client for interacting with DCLD using either the REST API or command line interface (CLI).
@@ -248,14 +275,11 @@ def main(use_main_net_dcld: str, use_test_net_dcld: str, use_main_net_http: bool
         is_paa = revocation_point["isPAA"]
 
         # 3. && 4. Validate VID/PID
-        # TODO: Need to support alternate representation of VID/PID (see spec "6.2.2.2. Encoding of Vendor ID and Product ID in subject and issuer fields")
-        crl_vid = extract_single_integer_attribute(crl_signer_certificate.subject, OID_VENDOR_ID)
-        crl_pid = extract_single_integer_attribute(crl_signer_certificate.subject, OID_PRODUCT_ID)
+        crl_vid, crl_pid = parse_vid_pid_from_distinguished_name(crl_signer_certificate.subject)
 
         if is_paa:
             if crl_vid is not None:
                 if vid != crl_vid:
-                    # TODO: Need to log all situations where a continue is called
                     logging.warning("VID is not CRL VID, continue...")
                     continue
         else:

docs/guides/simulated_device_linux.md

@@ -61,7 +61,7 @@ Now that the building is completed there is a `chip-app1` binary created. This
 binary can be executed on a linux os with test commands.
 
 ```
-./scripts/tests/yaml/runner.py [TEST NAME] app1
+./scripts/tests/chipyaml/runner.py [TEST NAME] app1
 ```
 
 ## Interacting with the simulated app

docs/testing/yaml.md

@@ -347,12 +347,12 @@ Compile chip-tool:
 
 NOTE: use the target appropriate to your system
 
-[chiptool.py](https://github.com/project-chip/connectedhomeip/blob/master/scripts/tests/yaml/chiptool.py)
+[chiptool.py](https://github.com/project-chip/connectedhomeip/blob/master/scripts/tests/chipyaml/chiptool.py)
 can be used to run tests against a commissioned DUT (commissioned by chip-tool).
 This will start an interactive instance of chip-tool automatically.
 
 ```
-./scripts/tests/yaml/chiptool.py tests Test_TC_OO_2_1 --server_path ./out/linux-x64-chip-tool/chip-tool
+./scripts/tests/chipyaml/chiptool.py tests Test_TC_OO_2_1 --server_path ./out/linux-x64-chip-tool/chip-tool
 
 ```
 
@@ -361,14 +361,14 @@ NOTE: substitute the appropriate test name and chip-tool path as appropriate.
 A list of available tests can be generated using:
 
 ```
-./scripts/tests/yaml/chiptool.py list
+./scripts/tests/chipyaml/chiptool.py list
 ```
 
 Config variables can be passed to chiptool.py after the script by separating
 with --
 
 ```
-./scripts/tests/yaml/chiptool.py tests Test_TC_OO_2_1 --server_path ./out/linux-x64-chip-tool/chip-tool -- nodeId 0x12344321
+./scripts/tests/chipyaml/chiptool.py tests Test_TC_OO_2_1 --server_path ./out/linux-x64-chip-tool/chip-tool -- nodeId 0x12344321
 
 ```
 

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

@@ -2257,6 +2257,7 @@ cluster Switch = 59 {
     kMomentarySwitchRelease = 0x4;
     kMomentarySwitchLongPress = 0x8;
     kMomentarySwitchMultiPress = 0x10;
+    kActionSwitch = 0x20;
   }
 
   info event SwitchLatched = 0 {

examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

@@ -1989,6 +1989,7 @@ cluster Switch = 59 {
     kMomentarySwitchRelease = 0x4;
     kMomentarySwitchLongPress = 0x8;
     kMomentarySwitchMultiPress = 0x10;
+    kActionSwitch = 0x20;
   }
 
   info event SwitchLatched = 0 {

examples/android/CHIPTest/BUILD.gn

@@ -33,7 +33,6 @@ shared_library("jni") {
     "${chip_root}/src/lib/support",
     "${chip_root}/src/lib/support:pw_tests_wrapper",
     "${chip_root}/src/lib/support:test_utils",
-    "${chip_root}/src/lib/support:testing_nlunit",
     "${chip_root}/src/lib/support/jsontlv",
     "${chip_root}/src/platform",
     "${chip_root}/src/platform/android",

examples/android/CHIPTest/app/src/main/cpp/CHIPTest-JNI.cpp

@@ -29,12 +29,12 @@
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/JniReferences.h>
-#include <lib/support/UnitTest.h>
-#include <lib/support/UnitTestRegistration.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/android/AndroidChipPlatform-JNI.h>
 
-#include <nlunit-test.h>
+#include "pw_unit_test/framework.h"
+#include "pw_unit_test/googletest_style_event_handler.h"
+#include "pw_unit_test/logging_event_handler.h"
 
 using namespace chip;
 
@@ -146,57 +146,60 @@ static void onLog(const char * fmt, ...)
     VerifyOrReturn(err != CHIP_NO_ERROR, ReportError(env, err, __FUNCTION__));
 }
 
-static void jni_log_name(struct _nlTestSuite * inSuite)
-{
-    onLog("[ %s ]\n", inSuite->name);
-}
+namespace pw::unit_test {
 
-static void jni_log_initialize(struct _nlTestSuite * inSuite, int inResult, int inWidth)
+class AndroidLoggingEventHandler : public pw::unit_test::LoggingEventHandler
 {
-    onLog("[ %s : %-*s ] : %s\n", inSuite->name, inWidth, "Initialize", inResult == FAILURE ? "FAILED" : "PASSED");
-}
-static void jni_log_terminate(struct _nlTestSuite * inSuite, int inResult, int inWidth)
-{
-    onLog("[ %s : %-*s ] : %s\n", inSuite->name, inWidth, "Terminate", inResult == FAILURE ? "FAILED" : "PASSED");
-}
+public:
+    void RunAllTestsStart() override { onLog(PW_UNIT_TEST_GOOGLETEST_RUN_ALL_TESTS_START); }
 
-static void jni_log_setup(struct _nlTestSuite * inSuite, int inResult, int inWidth)
-{
-    onLog("[ %s : %-*s ] : %s\n", inSuite->name, inWidth, "Setup", inResult == FAILURE ? "FAILED" : "PASSED");
-}
-
-static void jni_log_test(struct _nlTestSuite * inSuite, int inWidth, int inIndex)
-{
-    onLog("[ %s : %-*s ] : %s\n", inSuite->name, inWidth, inSuite->tests[inIndex].name, inSuite->flagError ? "FAILED" : "PASSED");
-}
-
-static void jni_log_teardown(struct _nlTestSuite * inSuite, int inResult, int inWidth)
-{
-    onLog("[ %s : %-*s ] : %s\n", inSuite->name, inWidth, "TearDown", inResult == FAILURE ? "FAILED" : "PASSED");
-}
-
-static void jni_log_statTest(struct _nlTestSuite * inSuite)
-{
-    onLog("Failed Tests:   %d / %d\n", inSuite->failedTests, inSuite->runTests);
-}
+    void RunAllTestsEnd(const RunTestsSummary & run_tests_summary) override
+    {
+        onLog(PW_UNIT_TEST_GOOGLETEST_RUN_ALL_TESTS_END);
+        onLog(PW_UNIT_TEST_GOOGLETEST_PASSED_SUMMARY, run_tests_summary.passed_tests);
+        if (run_tests_summary.skipped_tests)
+        {
+            onLog(PW_UNIT_TEST_GOOGLETEST_DISABLED_SUMMARY, run_tests_summary.skipped_tests);
+        }
+        if (run_tests_summary.failed_tests)
+        {
+            onLog(PW_UNIT_TEST_GOOGLETEST_FAILED_SUMMARY, run_tests_summary.failed_tests);
+        }
+    }
 
-static void jni_log_statAssert(struct _nlTestSuite * inSuite)
-{
-    onLog("Failed Asserts: %d / %d\n", inSuite->failedAssertions, inSuite->performedAssertions);
-}
+    void TestCaseStart(const TestCase & test_case) override
+    {
+        onLog(PW_UNIT_TEST_GOOGLETEST_CASE_START, test_case.suite_name, test_case.test_name);
+    }
 
-static nl_test_output_logger_t jni_test_logger = {
-    jni_log_name, jni_log_initialize, jni_log_terminate, jni_log_setup,
-    jni_log_test, jni_log_teardown,   jni_log_statTest,  jni_log_statAssert,
+    void TestCaseEnd(const TestCase & test_case, TestResult result) override
+    {
+        // Use a switch with no default to detect changes in the test result enum.
+        switch (result)
+        {
+        case TestResult::kSuccess:
+            onLog(PW_UNIT_TEST_GOOGLETEST_CASE_OK, test_case.suite_name, test_case.test_name);
+            break;
+        case TestResult::kFailure:
+            onLog(PW_UNIT_TEST_GOOGLETEST_CASE_FAILED, test_case.suite_name, test_case.test_name);
+            break;
+        case TestResult::kSkipped:
+            onLog(PW_UNIT_TEST_GOOGLETEST_CASE_DISABLED, test_case.suite_name, test_case.test_name);
+            break;
+        }
+    }
 };
+}; // namespace pw::unit_test
 
 extern "C" JNIEXPORT jint Java_com_tcl_chip_chiptest_TestEngine_runTest(JNIEnv * env, jclass clazz)
 {
-    nlTestSetLogger(&jni_test_logger);
     chip::DeviceLayer::StackLock lock;
-    // TODO [PW_MIGRATION] Remove NLUnit tests call after migration
-    jint ret = RunRegisteredUnitTests();
-    ret += chip::test::RunAllTests();
+
+    // Running Pigweed Tests
+    testing::InitGoogleTest(nullptr, static_cast<char **>(nullptr));
+    pw::unit_test::AndroidLoggingEventHandler handler;
+    pw::unit_test::RegisterEventHandler(&handler);
+    jint ret = RUN_ALL_TESTS();
 
     return ret;
 }

examples/bridge-app/bridge-common/bridge-app.matter

@@ -1574,6 +1574,7 @@ cluster Switch = 59 {
     kMomentarySwitchRelease = 0x4;
     kMomentarySwitchLongPress = 0x8;
     kMomentarySwitchMultiPress = 0x10;
+    kActionSwitch = 0x20;
   }
 
   info event SwitchLatched = 0 {