From f80d9af3b7bec5b8377fc3e7fb436d478a824993 Mon Sep 17 00:00:00 2001 From: Cyrus <24922493+cyrus-dev@users.noreply.github.com> Date: Fri, 22 Jan 2021 10:08:50 -0500 Subject: [PATCH] Some issues were found while doing script testings. These issues don't appear on Travis, however some of the issues were resolved in the scripts by making these changes. This is to test how travis will react. --- HIRS_ProvisionerTPM2/include/HirsRuntimeException.h | 4 ++-- HIRS_ProvisionerTPM2/src/CommandTpm2.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/HIRS_ProvisionerTPM2/include/HirsRuntimeException.h b/HIRS_ProvisionerTPM2/include/HirsRuntimeException.h index 2a5de23a..b97914b0 100644 --- 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 index 25986e7f..e9e0e5ad 100644 --- 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) {