Merge branch 'main' of https://github.com/stfc/CertWizard into main

stfc · Feb 22, 2022 · 30b2e73 · 30b2e73
2 parents b4997d2 + b903d8d
commit 30b2e73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.0</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.17.0</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>commons-validator</groupId>
@@ -124,7 +124,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.8.1</version>
+                        <version>3.10.0</version>
                         <configuration>
                             <showDeprecation>true</showDeprecation>
                         </configuration>
@@ -178,7 +178,7 @@
                     <plugin>
                         <groupId>io.github.fvarrui</groupId>
                         <artifactId>javapackager</artifactId>
-                        <version>1.6.2</version>
+                        <version>1.6.3</version>
                         <configuration>
                             <mainClass>${mainClass}</mainClass>
                             <bundleJre>true</bundleJre>

diff --git a/src/main/java/uk/ngs/ca/certificate/CertificateRequestCreator.java b/src/main/java/uk/ngs/ca/certificate/CertificateRequestCreator.java
@@ -110,7 +110,7 @@ public String createCertificateRequest(PrivateKey privkey, PublicKey pubkey) {
                 subjectAltNames = new GeneralNames(new GeneralName(GeneralName.rfc822Name, email));
             } else {
                 builder = new JcaPKCS10CertificationRequestBuilder(new X500Name(attrDN), pubkey);
-                subjectAltNames = new GeneralNames(new GeneralName(GeneralName.rfc822Name, "DNS: " + attrCN));
+                subjectAltNames = new GeneralNames(new GeneralName(GeneralName.dNSName, attrCN));
             }
             ContentSigner contentSigner = new JcaContentSignerBuilder(sig_alg).build(privkey);