fix warnings and errors in CI actions

siemens · Mar 27, 2024 · 8609086 · 8609086
1 parent cc40787
commit 8609086
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/src/main/java/com/siemens/pki/lightweightcmpclient/configuration/RevocationContextImpl.java b/src/main/java/com/siemens/pki/lightweightcmpclient/configuration/RevocationContextImpl.java
@@ -54,7 +54,7 @@ private void loadCert() {
             return;
         }
         final X509Certificate firstCert = certificates.get(0);
-        issuer = firstCert.getIssuerDN().getName();
+        issuer = firstCert.getIssuerX500Principal().getName();
         serialNumber = firstCert.getSerialNumber();
     }
 

diff --git a/src/test/java/com/siemens/pki/lightweightcmpclient/test/DelayedEnrollmentTestcaseBase.java b/src/test/java/com/siemens/pki/lightweightcmpclient/test/DelayedEnrollmentTestcaseBase.java
@@ -36,8 +36,8 @@ public static void setupRas() throws GeneralSecurityException, InterruptedExcept
 
     @AfterClass
     public static void stopAllRas() {
-        TestUtils.removeDirectories("./target/CmpTest/Downstream", "./target/CmpTest/Upstream");
         RA.stopAllRas();
+        TestUtils.removeDirectories("./target/CmpTest/Downstream", "./target/CmpTest/Upstream");
     }
 
     @After

diff --git a/src/test/java/com/siemens/pki/lightweightcmpra/test/framework/BaseCredentialService.java b/src/test/java/com/siemens/pki/lightweightcmpra/test/framework/BaseCredentialService.java
@@ -78,7 +78,8 @@ public BaseCredentialService(final String keyStorePath, final char[] password) t
                         // ignore all root certificates
                         continue;
                     }
-                    certsFromKeystore.put(x509aktChainCert.getSubjectDN().getName(), x509aktChainCert);
+                    certsFromKeystore.put(
+                            x509aktChainCert.getSubjectX500Principal().getName(), x509aktChainCert);
                 }
             }
             final Certificate certificate = keyStore.getCertificate(aktAlias);
@@ -89,7 +90,7 @@ public BaseCredentialService(final String keyStorePath, final char[] password) t
             if (CertUtility.isSelfSigned(x509Certificate)) {
                 continue;
             }
-            certsFromKeystore.put(x509Certificate.getSubjectDN().getName(), x509Certificate);
+            certsFromKeystore.put(x509Certificate.getSubjectX500Principal().getName(), x509Certificate);
             final Key aktKey = keyStore.getKey(aktAlias, password);
             if (!(aktKey instanceof PrivateKey)) {
                 continue;
@@ -108,14 +109,14 @@ public BaseCredentialService(final String keyStorePath, final char[] password) t
         // bring the certificates in the correct order
         // poor mens chain building, never use this algorithm for chain validation!
         certChain.add(endCertificate);
-        String curIssuer = endCertificate.getIssuerDN().getName();
+        String curIssuer = endCertificate.getIssuerX500Principal().getName();
         for (; ; ) {
             final X509Certificate nextIssuer = certsFromKeystore.remove(curIssuer);
             if (nextIssuer == null) {
                 break;
             }
             certChain.add(nextIssuer);
-            curIssuer = nextIssuer.getIssuerDN().getName();
+            curIssuer = nextIssuer.getIssuerX500Principal().getName();
         }
     }
 

diff --git a/src/test/java/com/siemens/pki/lightweightcmpra/test/framework/CmpCaMock.java b/src/test/java/com/siemens/pki/lightweightcmpra/test/framework/CmpCaMock.java
@@ -17,6 +17,13 @@
  */
 package com.siemens.pki.lightweightcmpra.test.framework;
 
+import com.siemens.pki.cmpracomponent.msggeneration.PkiMessageGenerator;
+import com.siemens.pki.cmpracomponent.protection.ProtectionProvider;
+import com.siemens.pki.cmpracomponent.util.MessageDumper;
+import com.siemens.pki.lightweightcmpra.downstream.DownstreamInterface.ExFunction;
+import com.siemens.pki.lightweightcmpra.downstream.online.CmpHttpServer;
+import com.siemens.pki.lightweightcmpra.test.EnrollmentTestcaseBase;
+import com.siemens.pki.lightweightcmpra.util.ConfigFileLoader;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigInteger;
@@ -31,9 +38,7 @@
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-
 import javax.security.auth.x500.X500Principal;
-
 import org.bouncycastle.asn1.cmp.CMPCertificate;
 import org.bouncycastle.asn1.cmp.PKIBody;
 import org.bouncycastle.asn1.cmp.PKIFailureInfo;
@@ -62,14 +67,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.siemens.pki.cmpracomponent.msggeneration.PkiMessageGenerator;
-import com.siemens.pki.cmpracomponent.protection.ProtectionProvider;
-import com.siemens.pki.cmpracomponent.util.MessageDumper;
-import com.siemens.pki.lightweightcmpra.downstream.DownstreamInterface.ExFunction;
-import com.siemens.pki.lightweightcmpra.downstream.online.CmpHttpServer;
-import com.siemens.pki.lightweightcmpra.test.EnrollmentTestcaseBase;
-import com.siemens.pki.lightweightcmpra.util.ConfigFileLoader;
-
 /**
  * a mocked Certificate Authority
  */