ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-31 00:24:00 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Minor refactor

Browse Source
This commit is contained in:
Cyrus 2022-11-18 14:10:32 -05:00
parent daafe8b899
commit 7859ee213a
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/util/PciIds.java → HIRS_AttestationCA/src/main/java/hirs/attestationca/validation/PciIds.java
View File

@ -1,4 +1,4 @@
package hirs.attestationca.portal.util; package hirs.attestationca.validation;
import com.github.marandus.pciid.model.Device; import com.github.marandus.pciid.model.Device;
import com.github.marandus.pciid.model.Vendor; import com.github.marandus.pciid.model.Vendor;

2
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/util/ReferenceManifestValidator.java → HIRS_AttestationCA/src/main/java/hirs/attestationca/validation/ReferenceManifestValidator.java
View File

@ -1,4 +1,4 @@
package hirs.attestationca.portal.util; package hirs.attestationca.validation;
import hirs.attestationca.entity.ReferenceManifest; import hirs.attestationca.entity.ReferenceManifest;
import hirs.attestationca.entity.certificate.CertificateAuthorityCredential; import hirs.attestationca.entity.certificate.CertificateAuthorityCredential;

13
HIRS_AttestationCA/src/main/java/hirs/attestationca/validation/SupplyChainCredentialValidator.java
View File

@ -3,14 +3,14 @@ package hirs.attestationca.validation;
import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import hirs.attestationca.entity.SupplyChainValidation;
import hirs.attestationca.entity.certificate.EndorsementCredential;
import hirs.attestationca.entity.certificate.PlatformCredential;
import hirs.attestationca.entity.certificate.attributes.ComponentIdentifier;
import hirs.attestationca.entity.certificate.attributes.V2.ComponentIdentifierV2;
import hirs.data.persist.AppraisalStatus; import hirs.data.persist.AppraisalStatus;
import hirs.data.persist.ArchivableEntity; import hirs.data.persist.ArchivableEntity;
import hirs.data.persist.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import hirs.data.persist.SupplyChainValidation;
import hirs.data.persist.certificate.EndorsementCredential;
import hirs.data.persist.certificate.PlatformCredential;
import hirs.data.persist.certificate.attributes.ComponentIdentifier;
import hirs.data.persist.certificate.attributes.V2.ComponentIdentifierV2;
import hirs.data.persist.info.ComponentInfo; import hirs.data.persist.info.ComponentInfo;
import hirs.data.persist.info.HardwareInfo; import hirs.data.persist.info.HardwareInfo;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
@ -263,8 +263,7 @@ public final class SupplyChainCredentialValidator implements CredentialValidator
*/ */
@Override @Override
public AppraisalStatus validatePlatformCredentialAttributes( public AppraisalStatus validatePlatformCredentialAttributes(
final P final PlatformCredential platformCredential,
latformCredential platformCredential,
final DeviceInfoReport deviceInfoReport, final DeviceInfoReport deviceInfoReport,
final EndorsementCredential endorsementCredential) { final EndorsementCredential endorsementCredential) {
final String baseErrorMessage = "Can't validate platform credential attributes without "; final String baseErrorMessage = "Can't validate platform credential attributes without ";

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

@ -18,7 +18,7 @@ import hirs.attestationca.service.ReferenceDigestValueService;
import hirs.attestationca.service.ReferenceManifestService; import hirs.attestationca.service.ReferenceManifestService;
import hirs.tpm.eventlog.TCGEventLog; import hirs.tpm.eventlog.TCGEventLog;
import hirs.tpm.eventlog.TpmPcrEvent; import hirs.tpm.eventlog.TpmPcrEvent;
import hirs.attestationca.portal.util.ReferenceManifestValidator; import hirs.attestationca.validation.ReferenceManifestValidator;
import hirs.attestationca.validation.SupplyChainCredentialValidator; import hirs.attestationca.validation.SupplyChainCredentialValidator;
import hirs.attestationca.validation.SupplyChainValidatorException; import hirs.attestationca.validation.SupplyChainValidatorException;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;

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

@ -8,6 +8,7 @@ import hirs.attestationca.entity.certificate.IssuedAttestationCertificate;
import hirs.attestationca.entity.certificate.PlatformCredential; import hirs.attestationca.entity.certificate.PlatformCredential;
import hirs.attestationca.entity.certificate.attributes.ComponentIdentifier; import hirs.attestationca.entity.certificate.attributes.ComponentIdentifier;
import hirs.attestationca.entity.certificate.attributes.PlatformConfiguration; import hirs.attestationca.entity.certificate.attributes.PlatformConfiguration;
import hirs.attestationca.validation.PciIds;
import hirs.utils.BouncyCastleUtils; import hirs.utils.BouncyCastleUtils;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;