ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-03-16 00:55:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed merge errors

Browse Source
This commit is contained in:
Cyrus 2022-01-25 08:11:50 -05:00
parent f3af30122b
commit f1aefcb9ba
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java
View File

@ -487,7 +487,7 @@ public class CertificateRequestPageController extends PageController<NoPageParam
try (ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream())) {
// get all files
for (IssuedAttestationCertificate ic : IssuedAttestationCertificate
for (IssuedCertificate ic : IssuedCertificate
.select(certificateManager)
.getCertificates()) {
zipFileName = String.format("Issued_Certificates[%s].cer",

2
HIRS_ProvisionerTPM2/src/TPM2_Provisioner.cpp
View File

@ -69,7 +69,7 @@ int provision() {
// if platformCredential is empty, not in TPM
// pull from properties file
if (platformCredential.empty()) {
// if (platformCredential.empty()) {
const std::string& cert_dir =
props.get(
"tcg.cert.dir",