From 06dc1197020239b44feb047c6918af0b33f9e344 Mon Sep 17 00:00:00 2001 From: Cyrus <24922493+cyrus-dev@users.noreply.github.com> Date: Thu, 1 Feb 2024 06:31:02 -0500 Subject: [PATCH 1/2] ASN1UTF8String change to DERUTF8String so that the vendor string aren't throwing exceptions because ANS1UTF8String.getInstance does not take Strings --- .../main/java/hirs/attestationca/persist/util/PciIds.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/util/PciIds.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/util/PciIds.java index b4c75b25..df421e65 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/util/PciIds.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/util/PciIds.java @@ -8,6 +8,7 @@ import hirs.attestationca.persist.entity.userdefined.certificate.attributes.Comp import hirs.attestationca.persist.entity.userdefined.certificate.attributes.V2.ComponentIdentifierV2; import lombok.AccessLevel; import lombok.NoArgsConstructor; + import org.bouncycastle.asn1.ASN1UTF8String; import org.bouncycastle.asn1.DERUTF8String; @@ -159,7 +160,7 @@ public final class PciIds { if (manufacturer != null && manufacturer.getString().trim().matches("^[0-9A-Fa-f]{4}$")) { Vendor ven = DB.findVendor(manufacturer.getString().toLowerCase()); if (ven != null && !Strings.isNullOrEmpty(ven.getName())) { - manufacturer = ASN1UTF8String.getInstance(ven.getName()); + manufacturer = new DERUTF8String(ven.getName()); } } return manufacturer; @@ -184,7 +185,7 @@ public final class PciIds { Device dev = DB.findDevice(manufacturer.getString().toLowerCase(), model.getString().toLowerCase()); if (dev != null && !Strings.isNullOrEmpty(dev.getName())) { - model = ASN1UTF8String.getInstance(dev.getName()); + model = new DERUTF8String(dev.getName()); } } return model; From 7c1f43c19bd14d98c74410a94232f5ca72fc9799 Mon Sep 17 00:00:00 2001 From: Cyrus <24922493+cyrus-dev@users.noreply.github.com> Date: Thu, 1 Feb 2024 06:47:46 -0500 Subject: [PATCH 2/2] Updated the reference to the getObject for a Tagged Object. this is current causing the build to fail in reference to #693 Unit test --- .../provision/helper/IssuedCertificateAttributeHelperTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/provision/helper/IssuedCertificateAttributeHelperTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/provision/helper/IssuedCertificateAttributeHelperTest.java index eb4710a9..15f9fefd 100644 --- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/provision/helper/IssuedCertificateAttributeHelperTest.java +++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/provision/helper/IssuedCertificateAttributeHelperTest.java @@ -191,7 +191,7 @@ public class IssuedCertificateAttributeHelperTest { DLSequence dlSequence = (DLSequence) subjectAlternativeName.getParsedValue(); ASN1TaggedObject asn1TaggedObject = (ASN1TaggedObject) dlSequence.getObjectAt(0); - ASN1Sequence asn1Sequence = (ASN1Sequence) asn1TaggedObject.getObject(); + ASN1Sequence asn1Sequence = (ASN1Sequence) asn1TaggedObject.getBaseObject(); Enumeration enumeration = asn1Sequence.getObjects(); while (enumeration.hasMoreElements()) {