From 799a9922f44ad570aced314424eeb34459d5e28c Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Fri, 12 Jan 2024 10:18:38 -0500
Subject: [PATCH] ACA was throwing up errors because of serialization for the
 Platform Cert, undid code for spotbugs to resolve the issue

---
 .../certificate/attributes/FIPSLevel.java     |  4 ---
 .../attributes/TBBSecurityAssertion.java      | 31 +++++++++++++++++--
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/FIPSLevel.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/FIPSLevel.java
index 9498fbb9..f5b9ce1f 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/FIPSLevel.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/FIPSLevel.java
@@ -76,8 +76,6 @@ public class FIPSLevel {
     private SecurityLevel level;
     @Getter @Setter
     private ASN1Boolean plus;
-    @Getter
-    private ASN1Sequence asn1Sequence;
 
     /**
      * Default constructor.
@@ -111,8 +109,6 @@ public class FIPSLevel {
         if (sequence.size() == MAX_SEQUENCE_SIZE) {
             plus = ASN1Boolean.getInstance(sequence.getObjectAt(2));
         }
-
-        this.asn1Sequence = sequence;
     }
 
     @Override
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/TBBSecurityAssertion.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/TBBSecurityAssertion.java
index ae732761..618db8e1 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/TBBSecurityAssertion.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/TBBSecurityAssertion.java
@@ -2,7 +2,6 @@ package hirs.attestationca.persist.entity.userdefined.certificate.attributes;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.Setter;
 import org.bouncycastle.asn1.ASN1Boolean;
 import org.bouncycastle.asn1.ASN1Enumerated;
 import org.bouncycastle.asn1.ASN1Integer;
@@ -86,9 +85,7 @@ public class TBBSecurityAssertion {
     }
 
     private ASN1Integer version;
-    @Getter @Setter
     private CommonCriteriaMeasures ccInfo;
-    @Getter @Setter
     private FIPSLevel fipsLevel;
     private MeasurementRootType rtmType;
     private ASN1Boolean iso9000Certified;
@@ -185,6 +182,34 @@ public class TBBSecurityAssertion {
         this.version = version;
     }
 
+    /**
+     * @return the ccInfo
+     */
+    public CommonCriteriaMeasures getCcInfo() {
+        return ccInfo;
+    }
+
+    /**
+     * @param ccInfo the ccInfo to set
+     */
+    public void setCcInfo(final CommonCriteriaMeasures ccInfo) {
+        this.ccInfo = ccInfo;
+    }
+
+    /**
+     * @return the fipsLevel
+     */
+    public FIPSLevel getFipsLevel() {
+        return fipsLevel;
+    }
+
+    /**
+     * @param fipsLevel the fipsLevel to set
+     */
+    public void setFipsLevel(final FIPSLevel fipsLevel) {
+        this.fipsLevel = fipsLevel;
+    }
+
     /**
      * @return the rtmType
      */