From c77ad68c08537897a1c1e004436d251acd820c33 Mon Sep 17 00:00:00 2001 From: Cyrus <24922493+cyrus-dev@users.noreply.github.com> Date: Wed, 20 Oct 2021 14:29:53 -0400 Subject: [PATCH] The variable pcrValues in Abstract Attestation CA class didn't need to be global, this was removed and set to a local variable with an empty string. --- .../AbstractAttestationCertificateAuthority.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java index 99a76900..6aeab8d4 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java @@ -181,7 +181,6 @@ public abstract class AbstractAttestationCertificateAuthority private final ReferenceEventManager referenceEventManager; private String tpmQuoteHash = ""; private String tpmQuoteSignature = ""; - private String pcrValues; /** * Constructor. @@ -719,6 +718,7 @@ public abstract class AbstractAttestationCertificateAuthority private DeviceInfoReport parseDeviceInfo(final ProvisionerTpm2.IdentityClaim claim) throws NoSuchAlgorithmException { ProvisionerTpm2.DeviceInfo dv = claim.getDv(); + String pcrValues = ""; // Get network info ProvisionerTpm2.NetworkInfo nwProto = dv.getNw(); @@ -769,7 +769,7 @@ public abstract class AbstractAttestationCertificateAuthority firstChassisSerialNumber, firstBaseboardSerialNumber); if (dv.hasPcrslist()) { - this.pcrValues = dv.getPcrslist().toStringUtf8(); + pcrValues = dv.getPcrslist().toStringUtf8(); } // check for RIM Base and Support files, if they don't exists in the database, load them @@ -946,7 +946,7 @@ public abstract class AbstractAttestationCertificateAuthority (short) 0, (short) 0, (short) 0, - this.pcrValues.getBytes(StandardCharsets.UTF_8), + pcrValues.getBytes(StandardCharsets.UTF_8), this.tpmQuoteHash.getBytes(StandardCharsets.UTF_8), this.tpmQuoteSignature.getBytes(StandardCharsets.UTF_8));