Skip to content

Commit 8e304c8

Browse files
willfurnellwillfurnell
committed
Update CA certs
1 parent 218b8f9 commit 8e304c8

File tree

4 files changed

+51
-50
lines changed

4 files changed

+51
-50
lines changed

‎pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>uk.ngs</groupId>
55
<artifactId>CertWizard</artifactId>
6-
<version>2.1.0</version>
6+
<version>2.1.1</version>
77
<dependencies>
88
<dependency>
99
<groupId>org.bouncycastle</groupId>
@@ -171,7 +171,7 @@
171171
<storepass>${codesignpass}</storepass>
172172
<!--suppress UnresolvedMavenProperty -->
173173
<keypass>${codesignpass}</keypass>
174-
<alias>1</alias>
174+
<alias>000_ukricodesign</alias>
175175
</configuration>
176176
</plugin>
177177

@@ -182,7 +182,7 @@
182182
<configuration>
183183
<mainClass>${mainClass}</mainClass>
184184
<bundleJre>true</bundleJre>
185-
<version>2.1.0</version>
185+
<version>2.1.1</version>
186186
<displayName>CertWizard</displayName>
187187
<organizationName>STFC</organizationName>
188188
<organizationUrl>https://stfc.ukri.org</organizationUrl>
@@ -212,7 +212,8 @@
212212
<storetype>PKCS12</storetype>
213213
<keystore>${codeSignCert}</keystore>
214214
<!--suppress UnresolvedMavenProperty -->
215-
<storepass>${codesignpass}</storepass>
215+
<storepass>${codesignpass}</storepass>
216+
<alias>000_ukricodesign</alias>
216217
</signing>
217218
</winConfig>
218219
</configuration>
@@ -226,7 +227,7 @@
226227
<configuration>
227228
<platform>mac</platform>
228229
<createZipball>true</createZipball>
229-
<jdkPath>C:\jdk\mac\jdk-11.0.18+10\Contents\Home</jdkPath>
230+
<jdkPath>C:\jdk\mac\jdk-17.0.6+10\Contents\Home</jdkPath>
230231
<macConfig>
231232
<icnsFile>src/main/resources/ngs-icon.icns</icnsFile>
232233
</macConfig>
@@ -238,4 +239,4 @@
238239
</build>
239240
</profile>
240241
</profiles>
241-
</project>
242+
</project>

‎src/main/resources/configure.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
# Client side version of this tool (this must correspond to the version
55
# supported by the server.
6-
ngsca.certwizard.version=CertWizard 2.1.0
7-
ngsca.certwizard.versionNumber=2.1.0
6+
ngsca.certwizard.version=CertWizard 2.1.1
7+
ngsca.certwizard.versionNumber=2.1.1
88

99
# CA-Server host that this tool is configured to work with.
1010
#ngsca.base.url=https://ca-dev.esc.rl.ac.uk
@@ -52,7 +52,7 @@ uk.ngs.ca.immegration.password.property=NGSCAPKCS12PASSWORD
5252
uk.ngs.ca.request.csr.url=https://cwiz-live.ca.ngs.ac.uk:443/CSR
5353
uk.ngs.ca.request.ca.url=https://cwiz-live.ca.ngs.ac.uk:443/CA
5454
uk.ngs.ca.request.ca.motd.text.url=https://cwiz-live.ca.ngs.ac.uk:443/CA/motd/text
55-
uk.ngs.ca.request.useragent=NGS-CertWizard/2.1.0
55+
uk.ngs.ca.request.useragent=NGS-CertWizard/2.1.1
5656
uk.ngs.ca.request.resource.publickey=https://cwiz-live.ca.ngs.ac.uk:443/resources/resource/publickey
5757

5858
uk.ngs.ca.request.certificate.url=https://cwiz-live.ca.ngs.ac.uk:443/certificate

‎src/main/resources/escience-2b.pem‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
-----BEGIN CERTIFICATE-----
2-
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
22+
9qoDx3FeEg==
2123
-----END CERTIFICATE-----

‎src/main/resources/escience-root.pem‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIDwzCCAqugAwIBAgICAQAwDQYJKoZIhvcNAQEFBQAwVDELMAkGA1UEBhMCVUsx
3-
FTATBgNVBAoTDGVTY2llbmNlUm9vdDESMBAGA1UECxMJQXV0aG9yaXR5MRowGAYD
4-
VQQDExFVSyBlLVNjaWVuY2UgUm9vdDAeFw0xMTA2MTgxMzAwMDBaFw0yNzEwMzAw
5-
OTAwMDBaMFMxCzAJBgNVBAYTAlVLMRMwEQYDVQQKEwplU2NpZW5jZUNBMRIwEAYD
6-
VQQLEwlBdXRob3JpdHkxGzAZBgNVBAMTElVLIGUtU2NpZW5jZSBDQSAyQjCCASIw
7-
DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkLgb2eIcly4LZfj0Rf5F7s+HE/
8-
6Tvpf4jsKkm7qs33y3EEudCbcPwQKjS2MgytPv+8xpEPHqy/hqTseNlZ6oJgc+V8
9-
xlJ+0iws882Ca8a9ZJ/iGQH9UzXU4q35ArN3cbwoWAAvMvzZ6hUV86fAAQ1AueQN
10-
6h7/tnfYfaUMiB4PNxucmouMHDJGmYzl47FtlLeHUr2c4m/oWSG5pADIvGFpWFHj
11-
NIw8/x4n97w5/ks0tc/8/5Q6xzUfCX/VfqciQCvKcui2J5MBhUlBDLenzwqvUytB
12-
4XAwX/pRcKmnFEYwoc9OKGExNx9tn9RjQYJAC/KLb44Jqno9l0eRxu3uw4sCAwEA
13-
AaOBnzCBnDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjA5BgNVHR8E
14-
MjAwMC6gLKAqhihodHRwOi8vY3JsLmNhLm5ncy5hYy51ay9jcmwvcm9vdC1jcmwu
15-
ZGVyMB0GA1UdDgQWBBQSpb+Rn3/ir2pcCfLi+lngNuHzVTAfBgNVHSMEGDAWgBRe
16-
+BtIpndrKTwuAFMzK2Oie36TwDANBgkqhkiG9w0BAQUFAAOCAQEAFQlXpYR45+fy
17-
uKIh/c+7nIxODO5iWmKskxDSQhqhMCU8/d5WVfXZ35XoTakhhsxu+Q3smIa6AhbA
18-
meAhIWc2kDgDatEUlMA5G3TQgUoQgjw5RAWxX5/7biaj2nSU7B4Nn5llOp4g+p9P
19-
5H+wGm2KFhvslaoKBKhSUkM/1teS+XsoDjqaPp/4RQ80ywUYhVWJz18vH1ltWLQW
20-
93i3mnLDDb+aOyeoxqIPCQSy6Q8nIYoM8e3jYvdjjZNruT45g6IK6bx7eQmEMfO+
21-
u7qJiCKWGMxY+72ZeOw/0DMw4y8kU0wrl7gQ1o1Jk94hHNpBam+hX0Btc1K7YwXB
22-
CemmHAuKQw==
23-
-----END CERTIFICATE-----
2+
MIIDiDCCAnCgAwIBAgIDAQAAMA0GCSqGSIb3DQEBCwUAMFQxCzAJBgNVBAYTAlVL
3+
MRUwEwYDVQQKEwxlU2NpZW5jZVJvb3QxEjAQBgNVBAsTCUF1dGhvcml0eTEaMBgG
4+
A1UEAxMRVUsgZS1TY2llbmNlIFJvb3QwHhcNMDcxMDMwMDkwMDAwWhcNMjcxMDMw
5+
MDkwMDAwWjBUMQswCQYDVQQGEwJVSzEVMBMGA1UEChMMZVNjaWVuY2VSb290MRIw
6+
EAYDVQQLEwlBdXRob3JpdHkxGjAYBgNVBAMTEVVLIGUtU2NpZW5jZSBSb290MIIB
7+
IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzc5G2aZQei3ANN8Afn94iWjf
8+
4EqgSUN5p43lKDaWE+7SVo9yHukcpLOWrIeZkayTd9lvyEGY7SUPj350qcDfXMtT
9+
qSgGN7VMep2sZk9yNObSWFz9KPOwG1abigL9ulgEAKWIH3Brd5K5ThGqrvWfv7gn
10+
5Y4q9oMe9pN1FgTenKJ7Zd7lBMjwJd50IyHXz4R0W/CVXv12WY1E1j3dlZS7o84v
11+
p34tqlCRSZqxcuPKM3Nyg9eAPIZq4c6qbKrG4/Hi0NOwLbmcqv7srmTdP6WmUn+M
12+
yRCX9AeCqcAEFdAgvPOu3RrydB0zw40D5uG37yzLh43/TMy6U2PyQDOu62SEmwID
13+
AQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
14+
FgQUXvgbSKZ3ayk8LgBTMytjont+k8AwHwYDVR0jBBgwFoAUXvgbSKZ3ayk8LgBT
15+
Mytjont+k8AwDQYJKoZIhvcNAQELBQADggEBAAYaJ/u66lGwzRoZM24QZ3FvHIVi
16+
LHyizT5L+GhGIPXQPvoQ0EaiMOQ1xUzMy96DMKfA7ltGOTyBlUm5KbxE2uj5azB/
17+
NujdFkGXP+dom3gX7khYV38OBMVu8a/O6aqXmaI8I5mQzl0TwQ3cCVWJO1kzx96e
18+
I7TRHZpGtng5rw4fuwdoOgoC/jXo0UOGki3YHMIFg+K9/d9yamdAfYmvbk3tfapT
19+
slZumdeFaZpRZqnxTI+jqhJkt3bsfLO27JQgCz5glxoDdjnBsFbcDgKVZcw8hps8
20+
9HduUIgoQHKnvVyuJoZiDXEFUH3Sonnf8LcnwvYPeaOHoriz0S4Q1RKug40=
21+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)