From bbed43c5248190f9e47ffa6c5b01965d0d5f33d9 Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Mon, 28 Jun 2021 12:21:54 -0400
Subject: [PATCH] This is to resolve a merge conflict from the previous push
---
.../SupplyChainValidationServiceImpl.java | 27 -------------------
1 file changed, 27 deletions(-)
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java
index 8b2cc88c..300e7ae4 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java
@@ -39,7 +39,6 @@ import hirs.validation.CredentialValidator;
import hirs.validation.SupplyChainCredentialValidator;
import hirs.validation.SupplyChainValidatorException;
import org.apache.logging.log4j.Level;
-import hirs.validation.SupplyChainValidatorException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.bouncycastle.util.encoders.Hex;
@@ -462,32 +461,6 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
break;
}
}
- //Validate signing cert
- Set<CertificateAuthorityCredential> allCerts =
- CertificateAuthorityCredential.select(certificateManager).getCertificates();
- CertificateAuthorityCredential signingCert = null;
- for (CertificateAuthorityCredential cert : allCerts) {
- if (Arrays.equals(cert.getEncodedPublicKey(),
- referenceManifestValidator.getPublicKey().getEncoded())) {
- signingCert = cert;
- KeyStore keyStore = getCaChain(signingCert);
- try {
- X509Certificate x509Cert = signingCert.getX509Certificate();
- if (!SupplyChainCredentialValidator.verifyCertificate(x509Cert, keyStore)) {
- passed = false;
- fwStatus = new AppraisalStatus(FAIL,
- "Firmware validation failed: invalid certificate path.");
- }
- } catch (IOException e) {
- LOGGER.error("Error getting X509 cert from manager: " + e.getMessage());
- } catch (SupplyChainValidatorException e) {
- LOGGER.error("Error validating cert against keystore: " + e.getMessage());
- fwStatus = new AppraisalStatus(FAIL,
- "Firmware validation failed: invalid certificate path.");
- }
- break;
- }
- }
if (signingCert == null) {
passed = false;