ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-04-08 03:44:31 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #698 from nsacyber/pciids-translate-failure

Browse Source 
PCI Ids Translation Fix
This commit is contained in:
Cyrus 2024-02-01 09:32:38 -05:00 committed by GitHub
commit ed44f7ad61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/util/PciIds.java
View File

@ -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;

2
HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/provision/helper/IssuedCertificateAttributeHelperTest.java
View File

@ -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()) {