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

Additional changes

Browse Source
This commit is contained in:
Cyrus 2022-11-18 10:34:33 -05:00
parent 99c615c636
commit 271cfa0145
16 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/Device.java
View File

@ -2,6 +2,7 @@ package hirs.attestationca.entity;
import hirs.data.persist.AbstractEntity; import hirs.data.persist.AbstractEntity;
import hirs.data.persist.AppraisalStatus; import hirs.data.persist.AppraisalStatus;
import hirs.data.persist.DeviceInfoReport;
import hirs.data.persist.enums.HealthStatus; import hirs.data.persist.enums.HealthStatus;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import hirs.foss.XMLCleaner; import hirs.foss.XMLCleaner;

2
HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/certificate/attributes/PlatformProperty.java
View File

@ -1,6 +1,6 @@
package hirs.attestationca.entity.certificate.attributes; package hirs.attestationca.entity.certificate.attributes;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import org.bouncycastle.asn1.ASN1Sequence; import org.bouncycastle.asn1.ASN1Sequence;
import org.bouncycastle.asn1.ASN1UTF8String; import org.bouncycastle.asn1.ASN1UTF8String;

2
HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/certificate/attributes/V2/CertificateIdentifier.java
View File

@ -1,6 +1,6 @@
package hirs.attestationca.entity.certificate.attributes.V2; package hirs.attestationca.entity.certificate.attributes.V2;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import java.math.BigInteger; import java.math.BigInteger;
import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.ASN1Integer;

2
HIRS_AttestationCA/src/main/java/hirs/attestationca/service/DeviceRegister.java
View File

@ -2,7 +2,7 @@ package hirs.attestationca.service;
import hirs.attestationca.entity.Device; import hirs.attestationca.entity.Device;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
/** /**
* Interface defining methods for registering a device with the system. * Interface defining methods for registering a device with the system.

2
HIRS_AttestationCA/src/main/java/hirs/attestationca/service/DeviceRegisterImpl.java
View File

@ -1,7 +1,7 @@
package hirs.attestationca.service; package hirs.attestationca.service;
import hirs.attestationca.entity.Device; import hirs.attestationca.entity.Device;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

2
HIRS_AttestationCA/src/test/java/hirs/attestationca/data/persist/DeviceInfoReportTest.java
View File

@ -2,7 +2,7 @@ package hirs.attestationca.data.persist;
import hirs.attestationca.persist.SpringPersistenceTest; import hirs.attestationca.persist.SpringPersistenceTest;
import hirs.attestationca.servicemanager.DBReportManager; import hirs.attestationca.servicemanager.DBReportManager;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import hirs.data.persist.info.FirmwareInfo; import hirs.data.persist.info.FirmwareInfo;
import hirs.data.persist.info.HardwareInfo; import hirs.data.persist.info.HardwareInfo;
import hirs.data.persist.info.NetworkInfo; import hirs.data.persist.info.NetworkInfo;

2
HIRS_AttestationCA/src/test/java/hirs/attestationca/data/persist/DeviceTest.java
View File

@ -2,7 +2,7 @@ package hirs.attestationca.data.persist;
import hirs.data.persist.AppraisalStatus; import hirs.data.persist.AppraisalStatus;
import hirs.attestationca.entity.Device; import hirs.attestationca.entity.Device;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import hirs.data.persist.enums.HealthStatus; import hirs.data.persist.enums.HealthStatus;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;

2
HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/DBDeviceGroupManagerTest.java
View File

@ -3,7 +3,7 @@ package hirs.attestationca.persist;
import hirs.appraiser.Appraiser; import hirs.appraiser.Appraiser;
import hirs.attestationca.servicemanager.DBDeviceManager; import hirs.attestationca.servicemanager.DBDeviceManager;
import hirs.attestationca.entity.Device; import hirs.attestationca.entity.Device;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import hirs.data.persist.policy.Policy; import hirs.data.persist.policy.Policy;
import hirs.persist.DBUtility; import hirs.persist.DBUtility;
import hirs.persist.PolicyMapper; import hirs.persist.PolicyMapper;

2
HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/DBDeviceManagerTest.java
View File

@ -3,7 +3,7 @@ package hirs.attestationca.persist;
import hirs.attestationca.data.persist.DeviceTest; import hirs.attestationca.data.persist.DeviceTest;
import hirs.attestationca.servicemanager.DBDeviceManager; import hirs.attestationca.servicemanager.DBDeviceManager;
import hirs.attestationca.entity.Device; import hirs.attestationca.entity.Device;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import hirs.data.persist.enums.HealthStatus; import hirs.data.persist.enums.HealthStatus;
import hirs.data.persist.info.NetworkInfo; import hirs.data.persist.info.NetworkInfo;
import hirs.persist.DBUtility; import hirs.persist.DBUtility;

2
HIRS_AttestationCA/src/test/java/hirs/attestationca/service/SupplyChainValidationServiceImplTest.java
View File

@ -6,7 +6,7 @@ import hirs.attestationca.servicemanager.DBDeviceManager;
import hirs.attestationca.validation.SupplyChainValidationServiceImpl; import hirs.attestationca.validation.SupplyChainValidationServiceImpl;
import hirs.data.persist.AppraisalStatus; import hirs.data.persist.AppraisalStatus;
import hirs.attestationca.entity.Device; import hirs.attestationca.entity.Device;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import hirs.attestationca.entity.SupplyChainValidation; import hirs.attestationca.entity.SupplyChainValidation;
import hirs.attestationca.entity.SupplyChainValidationSummary; import hirs.attestationca.entity.SupplyChainValidationSummary;
import hirs.attestationca.entity.certificate.Certificate; import hirs.attestationca.entity.certificate.Certificate;

2
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/AbstractAttestationCertificateAuthority.java
View File

@ -8,7 +8,7 @@ import hirs.attestationca.IssuedCertificateAttributeHelper;
import hirs.attestationca.configuration.provisionerTpm2.ProvisionerTpm2; import hirs.attestationca.configuration.provisionerTpm2.ProvisionerTpm2;
import hirs.attestationca.entity.BaseReferenceManifest; import hirs.attestationca.entity.BaseReferenceManifest;
import hirs.attestationca.entity.Device; import hirs.attestationca.entity.Device;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import hirs.attestationca.entity.EventLogMeasurements; import hirs.attestationca.entity.EventLogMeasurements;
import hirs.attestationca.entity.ReferenceDigestValue; import hirs.attestationca.entity.ReferenceDigestValue;
import hirs.attestationca.entity.ReferenceManifest; import hirs.attestationca.entity.ReferenceManifest;

2
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/CredentialValidator.java
View File

@ -1,6 +1,6 @@
package hirs.attestationca.portal.validation; package hirs.attestationca.portal.validation;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import hirs.attestationca.entity.SupplyChainValidation; import hirs.attestationca.entity.SupplyChainValidation;
import hirs.attestationca.entity.certificate.EndorsementCredential; import hirs.attestationca.entity.certificate.EndorsementCredential;
import hirs.attestationca.entity.certificate.PlatformCredential; import hirs.attestationca.entity.certificate.PlatformCredential;

2
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/SupplyChainCredentialValidator.java
View File

@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import hirs.data.persist.AppraisalStatus; import hirs.data.persist.AppraisalStatus;
import hirs.data.persist.ArchivableEntity; import hirs.data.persist.ArchivableEntity;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import hirs.data.persist.SupplyChainValidation; import hirs.data.persist.SupplyChainValidation;
import hirs.data.persist.certificate.EndorsementCredential; import hirs.data.persist.certificate.EndorsementCredential;
import hirs.data.persist.certificate.PlatformCredential; import hirs.data.persist.certificate.PlatformCredential;

2
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/SupplyChainValidationServiceImpl.java
View File

@ -7,7 +7,7 @@ import hirs.data.persist.AppraisalStatus;
import hirs.data.persist.ArchivableEntity; import hirs.data.persist.ArchivableEntity;
import hirs.attestationca.entity.BaseReferenceManifest; import hirs.attestationca.entity.BaseReferenceManifest;
import hirs.attestationca.entity.Device; import hirs.attestationca.entity.Device;
import hirs.attestationca.entity.DeviceInfoReport; import hirs.data.persist.DeviceInfoReport;
import hirs.attestationca.entity.EventLogMeasurements; import hirs.attestationca.entity.EventLogMeasurements;
import hirs.attestationca.entity.ReferenceDigestValue; import hirs.attestationca.entity.ReferenceDigestValue;
import hirs.attestationca.entity.ReferenceManifest; import hirs.attestationca.entity.ReferenceManifest;

4
HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/DeviceInfoReport.java → HIRS_Utils/src/main/java/hirs/data/persist/DeviceInfoReport.java
View File

@ -1,7 +1,5 @@
package hirs.attestationca.entity; package hirs.data.persist;
import hirs.data.persist.Digest;
import hirs.data.persist.Report;
import hirs.data.persist.info.FirmwareInfo; import hirs.data.persist.info.FirmwareInfo;
import hirs.data.persist.info.HardwareInfo; import hirs.data.persist.info.HardwareInfo;
import hirs.data.persist.info.NetworkInfo; import hirs.data.persist.info.NetworkInfo;

3
HIRS_Utils/src/main/java/hirs/data/persist/enums/DigestAlgorithm.java
View File

@ -1,7 +1,6 @@
package hirs.data.persist.enums; package hirs.data.persist.enums;
import hirs.data.persist.AbstractDigest; import hirs.data.persist.AbstractDigest;
import hirs.data.persist.DeviceInfoReport;
import java.io.Serializable; import java.io.Serializable;
@ -39,7 +38,7 @@ public enum DigestAlgorithm implements Serializable {
* Condition used when an algorithm is not specified and * Condition used when an algorithm is not specified and
* the size doesn't match known digests. * the size doesn't match known digests.
*/ */
UNSPECIFIED(DeviceInfoReport.NOT_SPECIFIED, Integer.BYTES); UNSPECIFIED("Not Specified", Integer.BYTES);
private final String standardAlgorithmName; private final String standardAlgorithmName;