From f96fa871382fb5a288896b61093c5042b489ca09 Mon Sep 17 00:00:00 2001 From: chubtub <43381989+chubtub@users.noreply.github.com> Date: Wed, 18 Oct 2023 09:45:19 -0400 Subject: [PATCH] Update import statements for dependents of RIM classes. Move PcIds class to HIRS_AttestationCA package. --- .../persist/service/SupplyChainValidationService.java | 2 +- .../attestationca/persist/service/ValidationService.java | 6 +++--- .../main/java/hirs/attestationca/persist/util}/PciIds.java | 0 .../persist/validation/FirmwareScvValidator.java | 7 ++++--- 4 files changed, 8 insertions(+), 7 deletions(-) rename {HIRS_Utils/src/main/java/hirs/utils => HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/util}/PciIds.java (100%) diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java index 9e6f5d4c..c55c1a90 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java @@ -1,7 +1,6 @@ package hirs.attestationca.persist.service; import hirs.attestationca.persist.DBManagerException; -import hirs.attestationca.persist.entity.ArchivableEntity; import hirs.attestationca.persist.entity.manager.CACredentialRepository; import hirs.attestationca.persist.entity.manager.CertificateRepository; import hirs.attestationca.persist.entity.manager.ComponentResultRepository; @@ -21,6 +20,7 @@ import hirs.attestationca.persist.entity.userdefined.rim.SupportReferenceManifes import hirs.attestationca.persist.enums.AppraisalStatus; import hirs.attestationca.persist.validation.PcrValidator; import hirs.attestationca.persist.validation.SupplyChainCredentialValidator; +import hirs.utils.ArchivableEntity; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/ValidationService.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/ValidationService.java index 1fe060b5..e54af196 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/ValidationService.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/ValidationService.java @@ -1,16 +1,13 @@ package hirs.attestationca.persist.service; -import hirs.attestationca.persist.entity.ArchivableEntity; import hirs.attestationca.persist.entity.manager.CACredentialRepository; import hirs.attestationca.persist.entity.manager.CertificateRepository; import hirs.attestationca.persist.entity.manager.ComponentResultRepository; import hirs.attestationca.persist.entity.manager.ReferenceDigestValueRepository; import hirs.attestationca.persist.entity.manager.ReferenceManifestRepository; -import hirs.attestationca.persist.entity.userdefined.Certificate; import hirs.attestationca.persist.entity.userdefined.Device; import hirs.attestationca.persist.entity.userdefined.PolicySettings; import hirs.attestationca.persist.entity.userdefined.SupplyChainValidation; -import hirs.attestationca.persist.entity.userdefined.certificate.CertificateAuthorityCredential; import hirs.attestationca.persist.entity.userdefined.certificate.ComponentResult; import hirs.attestationca.persist.entity.userdefined.certificate.EndorsementCredential; import hirs.attestationca.persist.entity.userdefined.certificate.PlatformCredential; @@ -19,7 +16,10 @@ import hirs.attestationca.persist.enums.AppraisalStatus; import hirs.attestationca.persist.validation.CertificateAttributeScvValidator; import hirs.attestationca.persist.validation.CredentialValidator; import hirs.attestationca.persist.validation.FirmwareScvValidator; +import hirs.utils.ArchivableEntity; import hirs.utils.BouncyCastleUtils; +import hirs.utils.Certificate; +import hirs.utils.CertificateAuthorityCredential; import lombok.extern.log4j.Log4j2; import org.apache.logging.log4j.Level; import org.bouncycastle.util.encoders.Hex; diff --git a/HIRS_Utils/src/main/java/hirs/utils/PciIds.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/util/PciIds.java similarity index 100% rename from HIRS_Utils/src/main/java/hirs/utils/PciIds.java rename to HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/util/PciIds.java diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/FirmwareScvValidator.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/FirmwareScvValidator.java index 6c07353c..65c3654c 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/FirmwareScvValidator.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/FirmwareScvValidator.java @@ -5,14 +5,15 @@ import hirs.attestationca.persist.entity.manager.ReferenceDigestValueRepository; import hirs.attestationca.persist.entity.manager.ReferenceManifestRepository; import hirs.attestationca.persist.entity.userdefined.Device; import hirs.attestationca.persist.entity.userdefined.PolicySettings; -import hirs.attestationca.persist.entity.userdefined.ReferenceManifest; -import hirs.attestationca.persist.entity.userdefined.certificate.CertificateAuthorityCredential; -import hirs.attestationca.persist.entity.userdefined.rim.BaseReferenceManifest; import hirs.attestationca.persist.entity.userdefined.rim.EventLogMeasurements; import hirs.attestationca.persist.entity.userdefined.rim.ReferenceDigestValue; import hirs.attestationca.persist.enums.AppraisalStatus; import hirs.attestationca.persist.service.ValidationService; +import hirs.utils.CertificateAuthorityCredential; import hirs.utils.SwidResource; +import hirs.utils.rim.ReferenceManifest; +import hirs.utils.rim.ReferenceManifestValidator; +import hirs.utils.rim.BaseReferenceManifest; import hirs.utils.tpm.eventlog.TCGEventLog; import hirs.utils.tpm.eventlog.TpmPcrEvent; import lombok.extern.log4j.Log4j2;