cm: cloudprotocol: update provisioning messages

Signed-off-by: Oleksandr Grytsov <[email protected]>

Author: al1img

src/core/cm/cloudprotocol/provisioning.hpp

@@ -14,120 +14,120 @@
 namespace aos::cloudprotocol {
 
 /**
- * StartProvisioningRequest message.
+ * CSR info.
  */
-struct StartProvisioningRequest {
-    Identity                      mNodeID;
-    StaticString<cCertSecretSize> mPassword;
+struct CSRInfo {
+    CertType                         mType;
+    StaticString<crypto::cCSRPEMLen> mCSR;
 
     /**
-     * Compares start provisioning request.
+     * Compares CSR info.
      *
-     * @param other object to compare with.
+     * @param other CSR info to compare with.
      * @return bool.
      */
-    bool operator==(const StartProvisioningRequest& other) const
-    {
-        return mNodeID == other.mNodeID && mPassword == other.mPassword;
-    }
+    bool operator==(const CSRInfo& other) const { return mType == other.mType && mCSR == other.mCSR; }
 
     /**
-     * Compares start provisioning request.
+     * Compares CSR info.
      *
-     * @param other object to compare with.
+     * @param other CSR info to compare with.
      * @return bool.
      */
-    bool operator!=(const StartProvisioningRequest& other) const { return !operator==(other); }
+    bool operator!=(const CSRInfo& other) const { return !operator==(other); }
 };
 
+using CSRInfoArray = StaticArray<CSRInfo, cCertsPerNodeCount>;
+
 /**
- * CSR info.
+ * Certificate info.
  */
-struct CSRInfo {
-    CertType                         mType;
-    StaticString<crypto::cCSRPEMLen> mCsr;
+struct CertInfo {
+    CertType                               mCertType;
+    StaticString<crypto::cCertChainPEMLen> mCertChain;
 
     /**
-     * Compares CSR info.
+     * Compares certificate info.
      *
-     * @param other CSR info to compare with.
+     * @param other object to compare with.
      * @return bool.
      */
-    bool operator==(const CSRInfo& other) const { return mType == other.mType && mCsr == other.mCsr; }
+    bool operator==(const CertInfo& other) const
+    {
+        return mCertType == other.mCertType && mCertChain == other.mCertChain;
+    }
 
     /**
-     * Compares CSR info.
+     * Compares certificate info.
      *
-     * @param other CSR info to compare with.
+     * @param other object to compare with.
      * @return bool.
      */
-    bool operator!=(const CSRInfo& other) const { return !operator==(other); }
+    bool operator!=(const CertInfo& other) const { return !operator==(other); }
 };
 
-using CSRInfoArray = StaticArray<CSRInfo, cCertsPerNodeCount>;
+using CertInfoArray = StaticArray<CertInfo, cCertsPerNodeCount>;
 
 /**
- * StartProvisioningResponse message.
+ * Start provisioning request.
  */
-struct StartProvisioningResponse {
-    Identity     mNodeID;
-    Error        mError;
-    CSRInfoArray mCSRs;
+struct StartProvisioningRequest {
+    Identity                      mNode;
+    StaticString<cCertSecretSize> mPassword;
 
     /**
-     * Compares start provisioning response.
+     * Compares start provisioning request.
      *
      * @param other object to compare with.
      * @return bool.
      */
-    bool operator==(const StartProvisioningResponse& other) const
+    bool operator==(const StartProvisioningRequest& other) const
     {
-        return mNodeID == other.mNodeID && mError == other.mError && mCSRs == other.mCSRs;
+        return mNode == other.mNode && mPassword == other.mPassword;
     }
 
     /**
-     * Compares start provisioning response.
+     * Compares start provisioning request.
      *
      * @param other object to compare with.
      * @return bool.
      */
-    bool operator!=(const StartProvisioningResponse& other) const { return !operator==(other); }
+    bool operator!=(const StartProvisioningRequest& other) const { return !operator==(other); }
 };
 
 /**
- * Certificate info.
+ * Start provisioning response.
  */
-struct CertInfo {
-    CertType                               mType;
-    StaticString<crypto::cCertChainPEMLen> mCertificateChain;
+struct StartProvisioningResponse {
+    Identity     mNode;
+    CSRInfoArray mCSRs;
+    Error        mError;
 
     /**
-     * Compares certificate info.
+     * Compares start provisioning response.
      *
      * @param other object to compare with.
      * @return bool.
      */
-    bool operator==(const CertInfo& other) const
+    bool operator==(const StartProvisioningResponse& other) const
     {
-        return mType == other.mType && mCertificateChain == other.mCertificateChain;
+        return mNode == other.mNode && mCSRs == other.mCSRs && mError == other.mError;
     }
 
     /**
-     * Compares certificate info.
+     * Compares start provisioning response.
      *
      * @param other object to compare with.
      * @return bool.
      */
-    bool operator!=(const CertInfo& other) const { return !operator==(other); }
+    bool operator!=(const StartProvisioningResponse& other) const { return !operator==(other); }
 };
 
-using CertInfoArray = StaticArray<CertInfo, cCertsPerNodeCount>;
-
 /**
  * FinishProvisioningRequest message.
  */
 struct FinishProvisioningRequest {
-    Identity                      mNodeID;
+    Identity                      mNode;
     CertInfoArray                 mCertificates;
     StaticString<cCertSecretSize> mPassword;
 
@@ -139,7 +139,7 @@ struct FinishProvisioningRequest {
      */
     bool operator==(const FinishProvisioningRequest& other) const
     {
-        return mNodeID == other.mNodeID && mCertificates == other.mCertificates && mPassword == other.mPassword;
+        return mNode == other.mNode && mCertificates == other.mCertificates && mPassword == other.mPassword;
     }
 
     /**
@@ -155,7 +155,7 @@ struct FinishProvisioningRequest {
  * FinishProvisioningResponse message.
  */
 struct FinishProvisioningResponse {
-    Identity mNodeID;
+    Identity mNode;
     Error    mError;
 
     /**
@@ -166,7 +166,7 @@ struct FinishProvisioningResponse {
      */
     bool operator==(const FinishProvisioningResponse& other) const
     {
-        return mNodeID == other.mNodeID && mError == other.mError;
+        return mNode == other.mNode && mError == other.mError;
     }
 
     /**
@@ -182,7 +182,7 @@ struct FinishProvisioningResponse {
  * DeprovisioningRequest message.
  */
 struct DeprovisioningRequest {
-    Identity                      mNodeID;
+    Identity                      mNode;
     StaticString<cCertSecretSize> mPassword;
 
     /**
@@ -193,7 +193,7 @@ struct DeprovisioningRequest {
      */
     bool operator==(const DeprovisioningRequest& other) const
     {
-        return mNodeID == other.mNodeID && mPassword == other.mPassword;
+        return mNode == other.mNode && mPassword == other.mPassword;
     }
 
     /**
@@ -209,7 +209,7 @@ struct DeprovisioningRequest {
  * DeprovisioningRequest message.
  */
 struct DeprovisioningResponse {
-    Identity mNodeID;
+    Identity mNode;
     Error    mError;
 
     /**
@@ -220,7 +220,7 @@ struct DeprovisioningResponse {
      */
     bool operator==(const DeprovisioningResponse& other) const
     {
-        return mNodeID == other.mNodeID && mError == other.mError;
+        return mNode == other.mNode && mError == other.mError;
     }
 
     /**