ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-02-22 10:20:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add additional location for pci.ids file and fix checkstyle issues from

Browse Source 
previous commit.
This commit is contained in:
iadgovuser29 2021-12-02 12:28:41 -05:00
parent 68be67b73a
commit a5c5a3ac60
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/util/PciIds.java
View File

@ -30,6 +30,7 @@ public final class PciIds {
{ {
add("/usr/share/hwdata/pci.ids"); add("/usr/share/hwdata/pci.ids");
add("/usr/share/misc/pci.ids"); add("/usr/share/misc/pci.ids");
add("/tmp/pci.ids");
} }
}); });

20
HIRS_ProvisionerTPM2/src/TPM2_Provisioner.cpp
View File

@ -68,7 +68,10 @@ int provision() {
// if platformCredential is empty, not in TPM // if platformCredential is empty, not in TPM
// pull from properties file // pull from properties file
if (platformCredential.empty()) { if (platformCredential.empty()) {
const std::string& cert_dir = props.get("tcg.cert.dir", "/boot/tcg/cert/platform/"); const std::string& cert_dir =
props.get(
"tcg.cert.dir",
"/boot/tcg/cert/platform/");
try { try {
platformCredentials = platformCredentials =
hirs::file_utils::search_directory(cert_dir); hirs::file_utils::search_directory(cert_dir);
@ -86,9 +89,18 @@ int provision() {
// collect TCG Boot files // collect TCG Boot files
std::vector<string> rim_files; std::vector<string> rim_files;
std::vector<string> swidtag_files; std::vector<string> swidtag_files;
const std::string& rim_dir = props.get("tcg.rim.dir", "/boot/tcg/manifest/rim/"); const std::string& rim_dir =
const std::string& swid_dir = props.get("tcg.swidtag.dir", "/boot/tcg/manifest/swidtag/"); props.get(
const std::string& live_log_file = props.get("tcg.event.file", "/sys/kernel/security/tpm0/binary_bios_measurements"); "tcg.rim.dir",
"/boot/tcg/manifest/rim/");
const std::string& swid_dir =
props.get(
"tcg.swidtag.dir",
"/boot/tcg/manifest/swidtag/");
const std::string& live_log_file =
props.get(
"tcg.event.file",
"/sys/kernel/security/tpm0/binary_bios_measurements");
try { try {
rim_files = hirs::file_utils::search_directory(rim_dir); rim_files = hirs::file_utils::search_directory(rim_dir);