mirror of
https://github.com/nsacyber/HIRS.git
synced 2025-02-07 03:40:10 +00:00
Additional changes
This commit is contained in:
parent
99c615c636
commit
271cfa0145
@ -2,6 +2,7 @@ package hirs.attestationca.entity;
|
||||
|
||||
import hirs.data.persist.AbstractEntity;
|
||||
import hirs.data.persist.AppraisalStatus;
|
||||
import hirs.data.persist.DeviceInfoReport;
|
||||
import hirs.data.persist.enums.HealthStatus;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import hirs.foss.XMLCleaner;
|
||||
|
@ -1,6 +1,6 @@
|
||||
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.ASN1UTF8String;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
package hirs.attestationca.entity.certificate.attributes.V2;
|
||||
|
||||
import hirs.attestationca.entity.DeviceInfoReport;
|
||||
import hirs.data.persist.DeviceInfoReport;
|
||||
import java.math.BigInteger;
|
||||
|
||||
import org.bouncycastle.asn1.ASN1Integer;
|
||||
|
@ -2,7 +2,7 @@ package hirs.attestationca.service;
|
||||
|
||||
|
||||
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.
|
||||
|
@ -1,7 +1,7 @@
|
||||
package hirs.attestationca.service;
|
||||
|
||||
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.Logger;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
@ -2,7 +2,7 @@ package hirs.attestationca.data.persist;
|
||||
|
||||
import hirs.attestationca.persist.SpringPersistenceTest;
|
||||
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.HardwareInfo;
|
||||
import hirs.data.persist.info.NetworkInfo;
|
||||
|
@ -2,7 +2,7 @@ package hirs.attestationca.data.persist;
|
||||
|
||||
import hirs.data.persist.AppraisalStatus;
|
||||
import hirs.attestationca.entity.Device;
|
||||
import hirs.attestationca.entity.DeviceInfoReport;
|
||||
import hirs.data.persist.DeviceInfoReport;
|
||||
import hirs.data.persist.enums.HealthStatus;
|
||||
import org.testng.Assert;
|
||||
import org.testng.annotations.Test;
|
||||
|
@ -3,7 +3,7 @@ package hirs.attestationca.persist;
|
||||
import hirs.appraiser.Appraiser;
|
||||
import hirs.attestationca.servicemanager.DBDeviceManager;
|
||||
import hirs.attestationca.entity.Device;
|
||||
import hirs.attestationca.entity.DeviceInfoReport;
|
||||
import hirs.data.persist.DeviceInfoReport;
|
||||
import hirs.data.persist.policy.Policy;
|
||||
import hirs.persist.DBUtility;
|
||||
import hirs.persist.PolicyMapper;
|
||||
|
@ -3,7 +3,7 @@ package hirs.attestationca.persist;
|
||||
import hirs.attestationca.data.persist.DeviceTest;
|
||||
import hirs.attestationca.servicemanager.DBDeviceManager;
|
||||
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.info.NetworkInfo;
|
||||
import hirs.persist.DBUtility;
|
||||
|
@ -6,7 +6,7 @@ import hirs.attestationca.servicemanager.DBDeviceManager;
|
||||
import hirs.attestationca.validation.SupplyChainValidationServiceImpl;
|
||||
import hirs.data.persist.AppraisalStatus;
|
||||
import hirs.attestationca.entity.Device;
|
||||
import hirs.attestationca.entity.DeviceInfoReport;
|
||||
import hirs.data.persist.DeviceInfoReport;
|
||||
import hirs.attestationca.entity.SupplyChainValidation;
|
||||
import hirs.attestationca.entity.SupplyChainValidationSummary;
|
||||
import hirs.attestationca.entity.certificate.Certificate;
|
||||
|
@ -8,7 +8,7 @@ import hirs.attestationca.IssuedCertificateAttributeHelper;
|
||||
import hirs.attestationca.configuration.provisionerTpm2.ProvisionerTpm2;
|
||||
import hirs.attestationca.entity.BaseReferenceManifest;
|
||||
import hirs.attestationca.entity.Device;
|
||||
import hirs.attestationca.entity.DeviceInfoReport;
|
||||
import hirs.data.persist.DeviceInfoReport;
|
||||
import hirs.attestationca.entity.EventLogMeasurements;
|
||||
import hirs.attestationca.entity.ReferenceDigestValue;
|
||||
import hirs.attestationca.entity.ReferenceManifest;
|
||||
|
@ -1,6 +1,6 @@
|
||||
package hirs.attestationca.portal.validation;
|
||||
|
||||
import hirs.attestationca.entity.DeviceInfoReport;
|
||||
import hirs.data.persist.DeviceInfoReport;
|
||||
import hirs.attestationca.entity.SupplyChainValidation;
|
||||
import hirs.attestationca.entity.certificate.EndorsementCredential;
|
||||
import hirs.attestationca.entity.certificate.PlatformCredential;
|
||||
|
@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import hirs.data.persist.AppraisalStatus;
|
||||
import hirs.data.persist.ArchivableEntity;
|
||||
import hirs.attestationca.entity.DeviceInfoReport;
|
||||
import hirs.data.persist.DeviceInfoReport;
|
||||
import hirs.data.persist.SupplyChainValidation;
|
||||
import hirs.data.persist.certificate.EndorsementCredential;
|
||||
import hirs.data.persist.certificate.PlatformCredential;
|
||||
|
@ -7,7 +7,7 @@ import hirs.data.persist.AppraisalStatus;
|
||||
import hirs.data.persist.ArchivableEntity;
|
||||
import hirs.attestationca.entity.BaseReferenceManifest;
|
||||
import hirs.attestationca.entity.Device;
|
||||
import hirs.attestationca.entity.DeviceInfoReport;
|
||||
import hirs.data.persist.DeviceInfoReport;
|
||||
import hirs.attestationca.entity.EventLogMeasurements;
|
||||
import hirs.attestationca.entity.ReferenceDigestValue;
|
||||
import hirs.attestationca.entity.ReferenceManifest;
|
||||
|
@ -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.HardwareInfo;
|
||||
import hirs.data.persist.info.NetworkInfo;
|
@ -1,7 +1,6 @@
|
||||
package hirs.data.persist.enums;
|
||||
|
||||
import hirs.data.persist.AbstractDigest;
|
||||
import hirs.data.persist.DeviceInfoReport;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@ -39,7 +38,7 @@ public enum DigestAlgorithm implements Serializable {
|
||||
* Condition used when an algorithm is not specified and
|
||||
* the size doesn't match known digests.
|
||||
*/
|
||||
UNSPECIFIED(DeviceInfoReport.NOT_SPECIFIED, Integer.BYTES);
|
||||
UNSPECIFIED("Not Specified", Integer.BYTES);
|
||||
|
||||
private final String standardAlgorithmName;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user