Merge pull request #332 from nsacyber/cpp-error-cleanup

CppCheck cleanup
nsacyber · Jan 28, 2021 · 8639e8b · 8639e8b
2 parents 4d8315f + a04b697
commit 8639e8b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/HIRS_ProvisionerTPM2/CMakeLists.txt b/HIRS_ProvisionerTPM2/CMakeLists.txt
@@ -251,6 +251,7 @@ if(STATIC_ANALYSIS)
             --error-exitcode=1
             --verbose
             --suppress=readdirCalled
+            --suppress=passedByValue
             -I include/
             src/
     )

diff --git a/HIRS_ProvisionerTPM2/include/HirsRuntimeException.h b/HIRS_ProvisionerTPM2/include/HirsRuntimeException.h
@@ -19,8 +19,8 @@ class HirsRuntimeException : public std::runtime_error {
                                     const std::string& origin = "");
 
  public:
-    HirsRuntimeException(const std::string& origin,
-                  const std::string& msg);
+    HirsRuntimeException(const std::string& msg,
+                         const std::string& origin);
 
     virtual ~HirsRuntimeException();
 };

diff --git a/HIRS_ProvisionerTPM2/src/CommandTpm2.cpp b/HIRS_ProvisionerTPM2/src/CommandTpm2.cpp
@@ -522,8 +522,9 @@ string CommandTpm2::createNvWriteCommandArgs(const string& nvIndex,
 /**
  * Method to get a quote (signed pcr selection) from the TPM 2.0 device.
  *
+ * @param pcr_selection selection of pcrs to sign
  * @param nonce blob provided by the ACA when the Identity Claim Request
- * @param pcr_election selection of pcrs to sign
+ * @return the argument string to be affixed to tpm quote
  */
 string CommandTpm2::getQuote(const string& pcr_selection,
                     const string& nonce) {