Updated Security Profiles Status Codes.

Updated status codes in the Security profile associated with
Certificate Provisioning Protocol.

Author: emargolis

src/lib/profiles/security/WeaveCertProvisioning.cpp

@@ -580,7 +580,7 @@ void WeaveCertProvEngine::HandleResponse(ExchangeContext * ec, const IPPacketInf
         outParam.Clear();
         inParam.Source = client;
 
-        if (statusReport.mStatusCode == Security::kStatusCode_NoNewCertRequired)
+        if (statusReport.mStatusCode == Security::kStatusCode_NoNewOperationalCertRequired)
         {
             inParam.ResponseReceived.ReplaceCert = false;
 

src/lib/profiles/security/WeaveSecurity.h

@@ -109,9 +109,10 @@ enum
     kStatusCode_InternalKeyError                = 16, // The receiver of the Weave message encountered key error.
     kStatusCode_NoCommonKeyExportConfiguration  = 17, // No common key export protocol configuration supported.
     kStatusCode_UnauthorizedKeyExportRequest    = 18, // An unauthorized key export request.
-    kStatusCode_ServiceCommunicationError       = 19, /**< The device could not complete certificate provisioning because it encountered an error when communicating with the service. */
-    kStatusCode_UnauthorizedGetCertRequest      = 20, /**< An unauthorized get certificate request. */
-    kStatusCode_NoNewCertRequired               = 21, /**< No new certificate required. */
+    kStatusCode_NoNewOperationalCertRequired    = 19, // No new operational certificate required.
+    kStatusCode_OperationalNodeIdInUse          = 20, // The specified operational node Id is already used by another Weave node (indication of node id collision).
+    kStatusCode_InvalidOperationalNodeId        = 21, // The specified operational node Id is invalid.
+    kStatusCode_InvalidOperationalCertificate   = 22, // The specified operational certificate is invalid.
 };
 
 // Weave Key Error Message Size

src/lib/support/StatusReportStr.cpp

@@ -267,9 +267,10 @@ NL_DLL_EXPORT const char *StatusReportStr(uint32_t profileId, uint16_t statusCod
         case Security::kStatusCode_InternalKeyError                                     : fmt = "[ Security(%08" PRIX32 "):%" PRIu16 " ] Internal key error"; break;
         case Security::kStatusCode_NoCommonKeyExportConfiguration                       : fmt = "[ Security(%08" PRIX32 "):%" PRIu16 " ] No common key export configuration"; break;
         case Security::kStatusCode_UnauthorizedKeyExportRequest                         : fmt = "[ Security(%08" PRIX32 "):%" PRIu16 " ] Unauthorized key export request"; break;
-        case Security::kStatusCode_ServiceCommunicationError                            : fmt = "[ Security(%08" PRIX32 "):%" PRIu16 " ] Service communication error"; break;
-        case Security::kStatusCode_UnauthorizedGetCertRequest                           : fmt = "[ Security(%08" PRIX32 "):%" PRIu16 " ] Unauthorized get certificate request"; break;
-        case Security::kStatusCode_NoNewCertRequired                                    : fmt = "[ Security(%08" PRIX32 "):%" PRIu16 " ] No new certificate required"; break;
+        case Security::kStatusCode_NoNewOperationalCertRequired                         : fmt = "[ Security(%08" PRIX32 "):%" PRIu16 " ] No new operational certificate required"; break;
+        case Security::kStatusCode_OperationalNodeIdInUse                               : fmt = "[ Security(%08" PRIX32 "):%" PRIu16 " ] Operational node Id collision"; break;
+        case Security::kStatusCode_InvalidOperationalNodeId                             : fmt = "[ Security(%08" PRIX32 "):%" PRIu16 " ] Invalid operational node Id"; break;
+        case Security::kStatusCode_InvalidOperationalCertificate                        : fmt = "[ Security(%08" PRIX32 "):%" PRIu16 " ] Invalid operational certificate"; break;
         default                                                                         : fmt = "[ Security(%08" PRIX32 "):%" PRIu16 " ]"; break;
         }
         break;

src/test-apps/TestStatusReportStr.cpp

@@ -69,7 +69,7 @@ struct Profile_Status {
     WeaveProfileId id;
     const char *fmt;
     uint8_t statusCount;
-    uint16_t statusCodes[21];
+    uint16_t statusCodes[23];
 };
 
 static struct Profile_Status sContext[] = {
@@ -204,7 +204,7 @@ static struct Profile_Status sContext[] = {
     {
         kWeaveProfile_Security,
         "[ Security(%08" PRIX32 "):%" PRIu16 " ]",
-        19,
+        23,
         {
             Security::kStatusCode_SessionAborted,
             Security::kStatusCode_PASESupportsOnlyConfig1,
@@ -225,6 +225,10 @@ static struct Profile_Status sContext[] = {
             Security::kStatusCode_InternalKeyError,
             Security::kStatusCode_NoCommonKeyExportConfiguration,
             Security::kStatusCode_UnauthorizedKeyExportRequest,
+            Security::kStatusCode_NoNewOperationalCertRequired,
+            Security::kStatusCode_OperationalNodeIdInUse,
+            Security::kStatusCode_InvalidOperationalNodeId,
+            Security::kStatusCode_InvalidOperationalCertificate,
          }
     },
     {