From 4a55f8509e51d73edb0e4bd42814ec276a345ec9 Mon Sep 17 00:00:00 2001
From: Will Furnell <will.furnell@stfc.ac.uk>
Date: Wed, 11 Aug 2021 09:36:37 +0100
Subject: [PATCH] Update sig alg for CSRs

---
 pom.xml                                     | 4 ++--
 src/main/resources/configure.properties     | 8 ++++----
 src/main/resources/configure_DEV.properties | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0bafa2a..0f6137c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>uk.ngs</groupId>
     <artifactId>CertWizard</artifactId>
-    <version>0.8.0</version>
+    <version>0.9.0</version>
     <dependencies>
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -182,7 +182,7 @@
                         <configuration>
                             <mainClass>${mainClass}</mainClass>
                             <bundleJre>true</bundleJre>
-                            <version>0.8.0</version>
+                            <version>0.9.0</version>
                             <displayName>CertWizard</displayName>
                             <organizationName>STFC</organizationName>
                             <organizationUrl>https://stfc.ukri.org</organizationUrl>
diff --git a/src/main/resources/configure.properties b/src/main/resources/configure.properties
index a62f9f4..a1afa27 100644
--- a/src/main/resources/configure.properties
+++ b/src/main/resources/configure.properties
@@ -3,8 +3,8 @@
 
 # Client side version of this tool (this must correspond to the version
 # supported by the server.
-ngsca.certwizard.version=CertWizard 0.8.1
-ngsca.certwizard.versionNumber=0.8.1
+ngsca.certwizard.version=CertWizard 0.9.0
+ngsca.certwizard.versionNumber=0.9.0
 
 # CA-Server host that this tool is configured to work with.
 #ngsca.base.url=https://ca-dev.esc.rl.ac.uk
@@ -32,7 +32,7 @@ ngsca.cert.cmd=Cmd
 ngsca.cert.operation=Operation
 ngsca.cert.profile=Profile
 ngsca.cert.transactionID=TransactionID
-ngsca.cert.signature.algorithm=MD5WithRSA
+ngsca.cert.signature.algorithm=SHA256withRSA
 ngsca.cert.truststore.password=passwd
 ngsca.cert.c=UK
 ngsca.cert.o=eScience
@@ -64,7 +64,7 @@ uk.ngs.ca.request.ca.maxprivatekeylifetime.url=https://cwiz-live.ca.ngs.ac.uk:44
 uk.ngs.ca.request.ca.maxexpiredrekey.url=https://cwiz-live.ca.ngs.ac.uk:443/CA/policy/maxexpiredrekey
 uk.ngs.ca.request.ca.motd.text.url=https://cwiz-live.ca.ngs.ac.uk:443/CA/motd/text
 uk.ngs.ca.request.ca.motd.img.url=https://cwiz-live.ca.ngs.ac.uk:443/CA/motd/img
-uk.ngs.ca.request.useragent=NGS-CertWizard/0.8.1
+uk.ngs.ca.request.useragent=NGS-CertWizard/0.9.0
 uk.ngs.ca.request.resource.publickey=https://cwiz-live.ca.ngs.ac.uk:443/resources/resource/publickey
 
 uk.ngs.ca.request.certificate.url=https://cwiz-live.ca.ngs.ac.uk:443/certificate
diff --git a/src/main/resources/configure_DEV.properties b/src/main/resources/configure_DEV.properties
index 825584c..33b8633 100644
--- a/src/main/resources/configure_DEV.properties
+++ b/src/main/resources/configure_DEV.properties
@@ -3,8 +3,8 @@
 
 # Client side version of this tool (this must correspond to the version
 # supported by the server.
-ngsca.certwizard.version=CertWizard 0.8.0
-ngsca.certwizard.versionNumber=0.8.0
+ngsca.certwizard.version=CertWizard 0.8.1
+ngsca.certwizard.versionNumber=0.8.1
 
 # CA-Server host that this tool is configured to work with.
 #ngsca.base.url=https://ca-dev.esc.rl.ac.uk
@@ -32,7 +32,7 @@ ngsca.cert.cmd=Cmd
 ngsca.cert.operation=Operation
 ngsca.cert.profile=Profile
 ngsca.cert.transactionID=TransactionID
-ngsca.cert.signature.algorithm=MD5WithRSA
+ngsca.cert.signature.algorithm=SHA512withRSA
 ngsca.cert.truststore.password=passwd
 ngsca.cert.c=UK
 ngsca.cert.o=eScienceDevCA
@@ -65,7 +65,7 @@ uk.ngs.ca.request.ca.maxprivatekeylifetime.url=https://cwiz-dev.ca.ngs.ac.uk:844
 uk.ngs.ca.request.ca.maxexpiredrekey.url=https://cwiz-dev.ca.ngs.ac.uk:8443/CA/policy/maxexpiredrekey
 uk.ngs.ca.request.ca.motd.text.url=https://cwiz-dev.ca.ngs.ac.uk:8443/CA/motd/text
 uk.ngs.ca.request.ca.motd.img.url=https://cwiz-dev.ca.ngs.ac.uk:8443/CA/motd/img
-uk.ngs.ca.request.useragent=NGS-CertWizard/0.8.0
+uk.ngs.ca.request.useragent=NGS-CertWizard/0.8.1
 uk.ngs.ca.request.resource.publickey=https://cwiz-dev.ca.ngs.ac.uk:8443/resources/resource/publickey
 
 uk.ngs.ca.request.certificate.url=https://cwiz-dev.ca.ngs.ac.uk:8443/certificate