ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-03-10 22:44:26 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Looking into the DN missing from the certificate details page I

Browse Source 
recognized that the setting of the variable for the portal page was
using the wrong getter method.
This commit is contained in:
Cyrus 2023-09-07 15:24:16 -04:00
parent 58b5de3bbb
commit 6629a87d56
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/Certificate.java
View File

@ -415,12 +415,22 @@ public abstract class Certificate extends ArchivableEntity {
case CertificateVariables.RSA512_256_OID:
this.signatureAlgorithm = CertificateVariables.RSA512_256_STRING;
break;
case CertificateVariables.ECDSA_OID:
this.signatureAlgorithm = CertificateVariables.ECDSA_STRING;
case CertificateVariables.ECDSA_SHA1_OID:
this.signatureAlgorithm = CertificateVariables.ECDSA_SHA1_STRING;
break;
case CertificateVariables.ECDSA_SHA224_OID:
this.signatureAlgorithm = CertificateVariables.ECDSA_SHA224_STRING;
break;
case CertificateVariables.ECDSA_SHA256_OID:
this.signatureAlgorithm = CertificateVariables.ECDSA_SHA256_STRING;
break;
case CertificateVariables.ECDSA_SHA384_OID:
this.signatureAlgorithm = CertificateVariables.ECDSA_SHA384_STRING;
break;
case CertificateVariables.ECDSA_SHA512_OID:
this.signatureAlgorithm = CertificateVariables.ECDSA_SHA512_STRING;
break;
default:
break;
}

16
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/CertificateVariables.java
View File

@ -28,20 +28,28 @@ public class CertificateVariables {
public static final String KEY_USAGE_CS = "CRL SIGN";
public static final String KEY_USAGE_EO = "ENCIPHER ONLY";
public static final String KEY_USAGE_DO = "DECIPHER ONLY";
public static final String ECDSA_OID = "1.2.840.10045.4.3.2";
public static final String ECDSA_SHA224_OID = "1.2.840.10045.4.1";
public static final String RSA1_OID = "1.2.840.113549.1.1.5";
public static final String RSA256_OID = "1.2.840.113549.1.1.11";
public static final String RSA384_OID = "1.2.840.113549.1.1.12";
public static final String RSA512_OID = "1.2.840.113549.1.1.13";
public static final String RSA224_OID = "1.2.840.113549.1.1.14";
public static final String RSA512_224_OID = "1.2.840.113549.1.1.15";
public static final String RSA512_256_OID = "1.2.840.113549.1.1.16";
public static final String RSA1_STRING = "SHA1WithRSA";
public static final String RSA224_STRING = "SHA224WithRSA";
public static final String RSA256_STRING = "SHA256WithRSA";
public static final String RSA384_STRING = "SHA384WithRSA";
public static final String RSA224_STRING = "SHA224WithRSA";
public static final String RSA512_STRING = "SHA512WithRSA";
public static final String RSA512_224_STRING = "SHA512-224WithRSA";
public static final String RSA512_256_STRING = "SHA512-256WithRSA";
public static final String ECDSA_STRING = "SHA256WithECDSA";
public static final String ECDSA_SHA1_OID = "1.2.840.10045.4.1";
public static final String ECDSA_SHA224_OID = "1.2.840.10045.4.3.1";
public static final String ECDSA_SHA256_OID = "1.2.840.10045.4.3.2";
public static final String ECDSA_SHA384_OID = "1.2.840.10045.4.3.3";
public static final String ECDSA_SHA512_OID = "1.2.840.10045.4.3.4";
public static final String ECDSA_SHA1_STRING = "SHA1WithECDSA";
public static final String ECDSA_SHA224_STRING = "SHA224WithECDSA";
public static final String ECDSA_SHA256_STRING = "SHA256WithECDSA";
public static final String ECDSA_SHA384_STRING = "SHA384WithECDSA";
public static final String ECDSA_SHA512_STRING = "SHA512WithECDSA";
}

8
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/utils/CertificateStringMapBuilder.java
View File

@ -47,7 +47,7 @@ public final class CertificateStringMapBuilder {
HashMap<String, String> data = new HashMap<>();
if (certificate != null) {
data.put("issuer", certificate.getHolderIssuer());
data.put("issuer", certificate.getIssuer());
//Serial number in hex value
data.put("serialNumber", Hex.toHexString(certificate.getSerialNumber().toByteArray()));
if (!certificate.getAuthoritySerialNumber().equals(BigInteger.ZERO)) {
@ -66,9 +66,9 @@ public final class CertificateStringMapBuilder {
if (certificate.getSubject() != null) {
data.put("subject", certificate.getSubject());
if (certificate.getHolderIssuer() != null) {
if (certificate.getIssuer() != null) {
data.put("isSelfSigned",
String.valueOf(certificate.getHolderIssuer().equals(certificate.getSubject())));
String.valueOf(certificate.getIssuer().equals(certificate.getSubject())));
} else {
data.put("isSelfSigned", "false");
}
@ -107,7 +107,7 @@ public final class CertificateStringMapBuilder {
if (missingCert != null) {
data.put("missingChainIssuer", String.format("Missing %s from the chain.",
missingCert.getHolderIssuer()));
missingCert.getIssuer()));
}
List<Certificate> certificates = certificateRepository.findBySubjectSorted(
certificate.getIssuerSorted(), "CertificateAuthorityCredential");