You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2021/11/25 08:57:56 UTC
[wicket] branch wicket-8.x updated: WICKET-6937 Update the keystore used by the quickstart application
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch wicket-8.x
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/wicket-8.x by this push:
new bceb52b WICKET-6937 Update the keystore used by the quickstart application
bceb52b is described below
commit bceb52b5733294ed7701020af14d4a1004455a28
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Thu Nov 25 10:56:23 2021 +0200
WICKET-6937 Update the keystore used by the quickstart application
The command used to generate the certificate is:
keytool -genkeypair -alias jetty -keyalg RSA -keysize 4096 -sigalg SHA256withRSA -keypass wicket -startdate "2021/11/25 00:00:00" -validity 3650 -storetype PKCS12 -storepass wicket -keystore keystore.p12
(cherry picked from commit 17fa392a8c371b30c00bebb62289bde79a402749)
---
.../archetype-resources/src/test/java/Start.java | 2 +-
.../src/test/jetty/jetty-ssl.xml | 23 ++++++++++++++++++++-
.../src/test/resources/keystore | Bin 1481 -> 0 bytes
.../src/test/resources/keystore.p12 | Bin 0 -> 4439 bytes
4 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
index 71e6785..d806ee1 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
@@ -43,7 +43,7 @@ public class Start
server.addConnector(http);
- Resource keystore = Resource.newClassPathResource("/keystore");
+ Resource keystore = Resource.newClassPathResource("/keystore.p12");
if (keystore != null && keystore.exists())
{
// if a keystore for a SSL certificate is available, start a SSL
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/jetty/jetty-ssl.xml b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/jetty/jetty-ssl.xml
index 0866726..f411ae7 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/jetty/jetty-ssl.xml
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/jetty/jetty-ssl.xml
@@ -6,7 +6,7 @@
<!-- and either jetty-https.xml or jetty-spdy.xml (but not both) -->
<!-- ============================================================= -->
<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
- <Set name="KeyStorePath"><Property name="maven.project.build.directory.test-classes" default="." />/<Property name="jetty.keystore" default="keystore"/></Set>
+ <Set name="KeyStorePath"><Property name="maven.project.build.directory.test-classes" default="." />/<Property name="jetty.keystore" default="keystore.p12"/></Set>
<Set name="KeyStorePassword"><Property name="jetty.keystore.password" default="wicket"/></Set>
<Set name="KeyManagerPassword"><Property name="jetty.keymanager.password" default="wicket"/></Set>
<Set name="EndpointIdentificationAlgorithm"></Set>
@@ -19,6 +19,27 @@
<Item>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
<Item>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
<Item>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</Item>
+ <Item>TLS_RSA_WITH_AES_256_GCM_SHA384</Item>
+ <Item>TLS_RSA_WITH_AES_128_GCM_SHA256</Item>
+ <Item>TLS_RSA_WITH_AES_256_CBC_SHA256</Item>
+ <Item>TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA</Item>
+ <Item>TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</Item>
+ <Item>TLS_RSA_WITH_AES_256_CBC_SHA</Item>
+ <Item>TLS_RSA_WITH_AES_256_CBC_SHA</Item>
+ <Item>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA</Item>
+ <Item>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA</Item>
+ <Item>TLS_DHE_RSA_WITH_AES_256_CBC_SHA</Item>
+ <Item>TLS_DHE_DSS_WITH_AES_256_CBC_SHA</Item>
+ <Item>TLS_RSA_WITH_AES_128_CBC_SHA256</Item>
+ <Item>TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA</Item>
+ <Item>TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</Item>
+ <Item>TLS_RSA_WITH_AES_128_CBC_SHA</Item>
+ <Item>TLS_RSA_WITH_AES_128_CBC_SHA</Item>
+ <Item>TLS_RSA_WITH_AES_128_CBC_SHA</Item>
+ <Item>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA</Item>
+ <Item>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA</Item>
+ <Item>TLS_DHE_RSA_WITH_AES_128_CBC_SHA</Item>
+ <Item>TLS_DHE_DSS_WITH_AES_128_CBC_SHA</Item>
</Array>
</Set>
<!-- =========================================================== -->
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore
deleted file mode 100644
index 30bbc90..0000000
Binary files a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore and /dev/null differ
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore.p12 b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore.p12
new file mode 100644
index 0000000..5dfa868
Binary files /dev/null and b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore.p12 differ