From 79127e57d1d316fc8a2cf632dd2b164bd4c36000 Mon Sep 17 00:00:00 2001 From: Cyrus <24922493+cyrus-dev@users.noreply.github.com> Date: Wed, 27 Oct 2021 14:55:50 -0400 Subject: [PATCH] Initi commit. There are warning that newer compilers are throwing for vector.at and vector.size. These are removed. In addition a char** in a main parameter was made into a const. --- HIRS_ProvisionerTPM2/src/DeviceInfoCollector.cpp | 13 ++++++++----- HIRS_ProvisionerTPM2/src/TPM2_Provisioner.cpp | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/HIRS_ProvisionerTPM2/src/DeviceInfoCollector.cpp b/HIRS_ProvisionerTPM2/src/DeviceInfoCollector.cpp index eb8f8742..e0685c87 100644 --- a/HIRS_ProvisionerTPM2/src/DeviceInfoCollector.cpp +++ b/HIRS_ProvisionerTPM2/src/DeviceInfoCollector.cpp @@ -208,15 +208,18 @@ hirs::pb::OsInfo DeviceInfoCollector::collectOsInfo() { while (getline(releaseFile, line)) { stringstream ss(line); string item; - vector tokens; + std::vector tokens; char* delim = const_cast("="); while (getline(ss, item, *delim)) { tokens.push_back(item); } - if (tokens.size() > 0 && tokens.at(0) == "ID") { - info.set_distribution(tokens.at(1)); - } else if (tokens.size() > 0 && tokens.at(0) == "VERSION_ID") { - info.set_distributionrelease(tokens.at(1)); + for (int i=0; i < tokens.size(); i++) { + if (tokens[i] == "ID") { + info.set_distribution(tokens[i+1]); + } + if (tokens[i] == "VERSION_ID") { + info.set_distributionrelease(tokens[i+1]); + } } } releaseFile.close(); diff --git a/HIRS_ProvisionerTPM2/src/TPM2_Provisioner.cpp b/HIRS_ProvisionerTPM2/src/TPM2_Provisioner.cpp index 323978ed..7d2700e3 100644 --- a/HIRS_ProvisionerTPM2/src/TPM2_Provisioner.cpp +++ b/HIRS_ProvisionerTPM2/src/TPM2_Provisioner.cpp @@ -178,7 +178,7 @@ void printHelp() { cout << helpMessage.str() << endl; } -int main(int argc, char** argv) { +int main(int argc, const char** argv) { string log_directory = "/var/log/hirs/provisioner"; // directory should be created by rpm install