Merge branch 'master' into feature/enhanced-setup-flow-client

credentials/test/revoked-attestation-certificates/Chip-Test-DAC-FFF1-8001-Signed-By-Revoked-PAI-Cert.pem

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB4zCCAYqgAwIBAgIIfxwXxgcMItIwCgYIKoZIzj0EAwIwRjEuMCwGA1UEAwwl
+TWF0dGVyIFRlc3QgUEFJIDB4RkZGMSBubyBQSUQgUmV2b2tlZDEUMBIGCisGAQQB
+gqJ8AgEMBEZGRjEwIBcNMjQxMjEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
+FDASBgorBgEEAYKifAICDAQ4MDAxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
+sNfyDFfIJAuXVFa6iG0ssJzU+dL1zxQG9GPJeYPzTtWjZ2H2ltiv9PPigoZbw3kU
+3rUSquiOWhWnGaS1eiZkD6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFDgkjA4XsiI0fkKqua8/3B09YUkEMB8GA1UdIwQYMBaAFJEz
+fFz+e7KTdv6IfTyU5/Wd2D0vMAoGCCqGSM49BAMCA0cAMEQCICv4s7VU7+W1P2YS
+iRqanmy3JnpVJX7zQUkpslnRt6LhAiBtz9DYStWjLJvQXuxKGw/3pDX+7UvFQPCH
+uB9uxQCbog==
+-----END CERTIFICATE-----

credentials/test/revoked-attestation-certificates/Chip-Test-DAC-FFF1-8001-Signed-By-Revoked-PAI-Key.pem

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJH6kWQP7l3MWrVt7LHLTS4AVsFrRSgxBMDISewT3M7voAoGCCqGSM49
+AwEHoUQDQgAEsNfyDFfIJAuXVFa6iG0ssJzU+dL1zxQG9GPJeYPzTtWjZ2H2ltiv
+9PPigoZbw3kU3rUSquiOWhWnGaS1eiZkDw==
+-----END EC PRIVATE KEY-----

credentials/test/revoked-attestation-certificates/Chip-Test-PAA-FFF1-CRL.pem

@@ -0,0 +1,8 @@
+-----BEGIN X509 CRL-----
+MIIBCDCBrwIBATAKBggqhkjOPQQDAjAwMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBQ
+QUExFDASBgorBgEEAYKifAIBDARGRkYxFw0yNDEyMTYxMTA1MDNaGA8yMTI0MTIx
+NzExMDUwM1owGzAZAggwJmQ5K4o/KhcNMjQxMjEzMDcyMDIxWqAvMC0wHwYDVR0j
+BBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYDVR0UBAMCAQIwCgYIKoZIzj0E
+AwIDSAAwRQIhAMvFTDo37sY0StA/szyNb5FNtcy/YE6FTmxmsC9kwjpcAiABhqHW
+yjWUkyWauRdFT1Uc5MgYADN0u8XcJy9e3Pzphw==
+-----END X509 CRL-----

credentials/test/revoked-attestation-certificates/Chip-Test-PAA-FFF1-Cert.der

@@ -0,0 +1 @@
+../../test/attestation/Chip-Test-PAA-FFF1-Cert.der

credentials/test/revoked-attestation-certificates/Chip-Test-PAA-FFF1-Cert.pem

@@ -0,0 +1 @@
+../../test/attestation/Chip-Test-PAA-FFF1-Cert.pem

credentials/test/revoked-attestation-certificates/Chip-Test-PAA-FFF1-Key.der

@@ -0,0 +1 @@
+../../test/attestation/Chip-Test-PAA-FFF1-Key.der

credentials/test/revoked-attestation-certificates/Chip-Test-PAA-FFF1-Key.pem

@@ -0,0 +1 @@
+../../test/attestation/Chip-Test-PAA-FFF1-Key.pem

credentials/test/revoked-attestation-certificates/Chip-Test-PAI-FFF1-noPID-Revoked-Cert.pem

@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB1DCCAXqgAwIBAgIIMCZkOSuKPyowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yNDEyMTMw
+MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEuMCwGA1UEAwwlTWF0dGVyIFRlc3Qg
+UEFJIDB4RkZGMSBubyBQSUQgUmV2b2tlZDEUMBIGCisGAQQBgqJ8AgEMBEZGRjEw
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS9WKhPeGLgdRxOVigPFJaX33xRqtxa
+T6OTyWJ3pZB53kCQereGDQad5lLqi8j3BTv+fDqO9HANdrnMINsxLK+Ro2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUkTN8
+XP57spN2/oh9PJTn9Z3YPS8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJx09qhLOstaNp3pA5kRTr8KVRULq9PVKyiY
+cIhHvJxuAiBlGIHIG3ogw0a5fGgxPEvhwKiPTzpAcu08fqEdxgmE/A==
+-----END CERTIFICATE-----

credentials/test/revoked-attestation-certificates/Chip-Test-PAI-FFF1-noPID-Revoked-Key.pem

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIH/u0uB3zq1YnR1XR58XEUVgOnq8mLeBoJH1AYvyJW9joAoGCCqGSM49
+AwEHoUQDQgAEvVioT3hi4HUcTlYoDxSWl998UarcWk+jk8lid6WQed5AkHq3hg0G
+neZS6ovI9wU7/nw6jvRwDXa5zCDbMSyvkQ==
+-----END EC PRIVATE KEY-----

credentials/test/revoked-attestation-certificates/Matter-Development-DAC-FFF1-8001-Revoked-01-Cert.pem

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5TCCAYugAwIBAgIIGTZ9l46sUzowCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjEwIBcNMjQxMjEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFAxIjAgBgNVBAMM
+GU1hdHRlciBEZXYgREFDIFJldm9rZWQgMDExFDASBgorBgEEAYKifAIBDARGRkYx
+MRQwEgYKKwYBBAGConwCAgwEODAwMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
+BCo9c3DyIJuxObQsptldvy9wGIi0cY4yxjrnEycUXgUYeGi1KPGpnSRvFHCwzNhV
+7pQ4NSbuCQ3guy/eA4/uPgujYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQD
+AgeAMB0GA1UdDgQWBBT1iulTpObPsMw95NxMM6/gl6oRgjAfBgNVHSMEGDAWgBRj
+VA5H9kscONE4hKRi0WwZXY/7PDAKBggqhkjOPQQDAgNIADBFAiAYM2RESU1NGMeB
+S287Dz9/pd0hJWUVAx2jH9f/jRsQ/QIhAOdcvxcaOJB6kyoWeeXVtCPmoWZynYI/
+7IRPIu85iRKk
+-----END CERTIFICATE-----

credentials/test/revoked-attestation-certificates/Matter-Development-DAC-FFF1-8001-Revoked-01-Key.pem

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEICRu6mYqRMtt6T7/1hTpbTcV3oz7bU6XVkTuXmbst5x5oAoGCCqGSM49
+AwEHoUQDQgAEKj1zcPIgm7E5tCym2V2/L3AYiLRxjjLGOucTJxReBRh4aLUo8amd
+JG8UcLDM2FXulDg1Ju4JDeC7L94Dj+4+Cw==
+-----END EC PRIVATE KEY-----

credentials/test/revoked-attestation-certificates/Matter-Development-DAC-FFF1-8001-Revoked-02-Cert.pem

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5TCCAYugAwIBAgIIJWk4PSS7NuowCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjEwIBcNMjQxMjEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFAxIjAgBgNVBAMM
+GU1hdHRlciBEZXYgREFDIFJldm9rZWQgMDIxFDASBgorBgEEAYKifAIBDARGRkYx
+MRQwEgYKKwYBBAGConwCAgwEODAwMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
+BNlxPEillSfpPno+VJ6PsOAIKdSgLIzt8o39dGcrABmMfuQ/NeOs4dGrSXsy3eTN
+1qhHYWIZHJUUrve/EV+2xHKjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQD
+AgeAMB0GA1UdDgQWBBTjr5GCszQP3IXHpYtLOISmVUsxTzAfBgNVHSMEGDAWgBRj
+VA5H9kscONE4hKRi0WwZXY/7PDAKBggqhkjOPQQDAgNIADBFAiEAr76P8JYuh1ow
+VO5aLfXEx4wFRltA0xA/mfflYoeA+QMCIBphV/DfeCMiOuJKo6j3phN7SRTGtvXk
+Cil9erdx6cvG
+-----END CERTIFICATE-----

credentials/test/revoked-attestation-certificates/Matter-Development-DAC-FFF1-8001-Revoked-02-Key.pem

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEICL40ZprUkEw7MrV0YfOjrfqnX/9WGi04MqRvCtshDmcoAoGCCqGSM49
+AwEHoUQDQgAE2XE8SKWVJ+k+ej5Uno+w4Agp1KAsjO3yjf10ZysAGYx+5D8146zh
+0atJezLd5M3WqEdhYhkclRSu978RX7bEcg==
+-----END EC PRIVATE KEY-----

credentials/test/revoked-attestation-certificates/Matter-Development-DAC-FFF1-8001-Revoked-03-Cert.pem

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5jCCAYugAwIBAgIICrBCSUMj/lQwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjEwIBcNMjQxMjEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFAxIjAgBgNVBAMM
+GU1hdHRlciBEZXYgREFDIFJldm9rZWQgMDMxFDASBgorBgEEAYKifAIBDARGRkYx
+MRQwEgYKKwYBBAGConwCAgwEODAwMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
+BCLlc2XpiZD/dQbhHr7DP/g0o5mZ8tnWNe9YR+vgWNh9G/vh5eJBG7bcEfPyfoQs
+wMyr4CpPJp1Q9coHKiY12wSjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQD
+AgeAMB0GA1UdDgQWBBQq0efT8UgAKTZu5MXwcQfySp2brTAfBgNVHSMEGDAWgBRj
+VA5H9kscONE4hKRi0WwZXY/7PDAKBggqhkjOPQQDAgNJADBGAiEA5mlgzDtuph+I
+ML94iDAWa1xqMY6DKEYEqVvCZVvYdOsCIQD1A4Bnl6USq1CTEugIL8goYiaW09dQ
+H38+aLYav+W9uA==
+-----END CERTIFICATE-----

credentials/test/revoked-attestation-certificates/Matter-Development-DAC-FFF1-8001-Revoked-03-Key.pem

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJjC2LN18deS5XLHAbR0Dn+4Gp6cyTaqKg+HbOja5VeMoAoGCCqGSM49
+AwEHoUQDQgAEIuVzZemJkP91BuEevsM/+DSjmZny2dY171hH6+BY2H0b++Hl4kEb
+ttwR8/J+hCzAzKvgKk8mnVD1ygcqJjXbBA==
+-----END EC PRIVATE KEY-----

credentials/test/revoked-attestation-certificates/Matter-Development-PAI-FFF1-noPID-CRL.pem

@@ -0,0 +1,9 @@
+-----BEGIN X509 CRL-----
+MIIBSjCB8gIBATAKBggqhkjOPQQDAjA9MSUwIwYDVQQDDBxNYXR0ZXIgRGV2IFBB
+SSAweEZGRjEgbm8gUElEMRQwEgYKKwYBBAGConwCAQwERkZGMRcNMjQxMjE2MTEx
+NjA2WhgPMjEyNDEyMTcxMTE2MDZaMFEwGQIICrBCSUMj/lQXDTI0MTIxMzA3MTUz
+MlowGQIIGTZ9l46sUzoXDTI0MTIxMzA3MTUyNFowGQIIJWk4PSS7NuoXDTI0MTIx
+MzA3MTUyOFqgLzAtMB8GA1UdIwQYMBaAFGNUDkf2Sxw40TiEpGLRbBldj/s8MAoG
+A1UdFAQDAgEEMAoGCCqGSM49BAMCA0cAMEQCIByf5LFJrnfa/5jA6PfQmaJcJ7Jl
+gv6bezlfodLtO8CqAiBL1+I4+ETEN0h0+rvkM5CQWoLK76XNb92OV1Mn9E3DQw==
+-----END X509 CRL-----

credentials/test/revoked-attestation-certificates/Matter-Development-PAI-FFF1-noPID-Cert.der

@@ -0,0 +1 @@
+../../development/attestation/Matter-Development-PAI-FFF1-noPID-Cert.der

credentials/test/revoked-attestation-certificates/Matter-Development-PAI-FFF1-noPID-Cert.pem

@@ -0,0 +1 @@
+../../development/attestation/Matter-Development-PAI-FFF1-noPID-Cert.pem

credentials/test/revoked-attestation-certificates/Matter-Development-PAI-FFF1-noPID-Key.der

@@ -0,0 +1 @@
+../../development/attestation/Matter-Development-PAI-FFF1-noPID-Key.der

credentials/test/revoked-attestation-certificates/Matter-Development-PAI-FFF1-noPID-Key.pem

@@ -0,0 +1 @@
+../../development/attestation/Matter-Development-PAI-FFF1-noPID-Key.pem

scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp

@@ -1226,43 +1226,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace SmokeCoAlarm
 
-namespace SoftwareDiagnostics {
-
-void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
-{
-    CHIP_ERROR TLVError = CHIP_NO_ERROR;
-    bool wasHandled     = false;
-    {
-        switch (aCommandPath.mCommandId)
-        {
-        case Commands::ResetWatermarks::Id: {
-            Commands::ResetWatermarks::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
-            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
-                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
-            return;
-        }
-        }
-    }
-
-    if (CHIP_NO_ERROR != TLVError || !wasHandled)
-    {
-        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
-        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
-    }
-}
-
-} // namespace SoftwareDiagnostics
-
 namespace TemperatureControl {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -1935,9 +1898,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::SmokeCoAlarm::Id:
         Clusters::SmokeCoAlarm::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
-    case Clusters::SoftwareDiagnostics::Id:
-        Clusters::SoftwareDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
-        break;
     case Clusters::TemperatureControl::Id:
         Clusters::TemperatureControl::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;

scripts/tools/zap/tests/outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp

@@ -930,43 +930,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace OperationalCredentials
 
-namespace SoftwareDiagnostics {
-
-void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
-{
-    CHIP_ERROR TLVError = CHIP_NO_ERROR;
-    bool wasHandled     = false;
-    {
-        switch (aCommandPath.mCommandId)
-        {
-        case Commands::ResetWatermarks::Id: {
-            Commands::ResetWatermarks::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
-            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
-                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
-            return;
-        }
-        }
-    }
-
-    if (CHIP_NO_ERROR != TLVError || !wasHandled)
-    {
-        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
-        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
-    }
-}
-
-} // namespace SoftwareDiagnostics
-
 namespace ThreadNetworkDiagnostics {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -1083,9 +1046,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::OperationalCredentials::Id:
         Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
-    case Clusters::SoftwareDiagnostics::Id:
-        Clusters::SoftwareDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
-        break;
     case Clusters::ThreadNetworkDiagnostics::Id:
         Clusters::ThreadNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;

src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp

@@ -220,14 +220,6 @@ void SoftwareDiagnosticsServer::OnSoftwareFaultDetect(const SoftwareDiagnostics:
 } // namespace app
 } // namespace chip
 
-bool emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(app::CommandHandler * commandObj,
-                                                              const app::ConcreteCommandPath & commandPath,
-                                                              const Commands::ResetWatermarks::DecodableType & commandData)
-{
-    // Shouldn't be called at all.
-    return false;
-}
-
 void MatterSoftwareDiagnosticsPluginServerInitCallback()
 {
     AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);

src/app/common/templates/config-data.yaml

@@ -50,6 +50,7 @@ CommandHandlerInterfaceOnlyClusters:
     - Water Heater Management
     - Water Heater Mode
     - General Commissioning
+    - Software Diagnostics
 
 # We need a more configurable way of deciding which clusters have which init functions....
 # See https://github.com/project-chip/connectedhomeip/issues/4369