You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/04/25 18:20:26 UTC
[tomee] branch master updated: TOMEE-3926 - Fix Webservice SSL Client Certificate Example
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 678c4ee901 TOMEE-3926 - Fix Webservice SSL Client Certificate Example
678c4ee901 is described below
commit 678c4ee9015d7fcdc95816b9140f2131de23c28b
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Mon Apr 25 20:20:17 2022 +0200
TOMEE-3926 - Fix Webservice SSL Client Certificate Example
---
examples/webservice-ssl-client-cert/create-keystores.xml | 9 ++-------
examples/webservice-ssl-client-cert/pom.xml | 4 ++--
.../webservice-ssl-client-cert/src/test/conf/server.xml | 14 +++++++++-----
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/examples/webservice-ssl-client-cert/create-keystores.xml b/examples/webservice-ssl-client-cert/create-keystores.xml
index 08c415e6c2..7247808cc4 100644
--- a/examples/webservice-ssl-client-cert/create-keystores.xml
+++ b/examples/webservice-ssl-client-cert/create-keystores.xml
@@ -31,11 +31,10 @@
<available classname="sun.security.tools.keytool.Main"/> <!-- java 8 -->
</condition>
- <property name="server.alias" value="serveralias"/>
- <property name="server.keypass" value="serverPassword"/>
+ <property name="server.alias" value="tomcat"/>
<property name="server.keystore" value="${basedir}/target/serverStore.jks"/>
<property name="server.storepass" value="keystorePass"/>
- <property name="server.dname" value="'cn=serveralias'"/>
+ <property name="server.dname" value="'cn=tomcat'"/>
<property name="server.file" value="${basedir}/target/serverKey.rsa"/>
<property name="client.alias" value="clientalias"/>
@@ -54,7 +53,6 @@
<java classname="com.ibm.crypto.tools.KeyTool" fork="true">
<arg line="-genkey"/>
<arg line="-alias ${server.alias}"/>
- <arg line="-keypass ${server.keypass}"/>
<arg line="-keystore ${server.keystore}"/>
<arg line="-storepass ${server.storepass}"/>
<arg line="-dname ${server.dname}"/>
@@ -65,7 +63,6 @@
<arg line="-alias ${server.alias}"/>
<arg line="-keystore ${server.keystore}"/>
<arg line="-storepass ${server.storepass}"/>
- <arg line="-keypass ${server.keypass}"/>
</java>
<java classname="com.ibm.crypto.tools.KeyTool" fork="true">
<arg line="-export"/>
@@ -127,7 +124,6 @@
<arg line="-genkey"/>
<arg line="-storetype JKS"/>
<arg line="-alias ${server.alias}"/>
- <arg line="-keypass ${server.keypass}"/>
<arg line="-keystore ${server.keystore}"/>
<arg line="-storepass ${server.storepass}"/>
<arg line="-dname ${server.dname}"/>
@@ -139,7 +135,6 @@
<arg line="-alias ${server.alias}"/>
<arg line="-keystore ${server.keystore}"/>
<arg line="-storepass ${server.storepass}"/>
- <arg line="-keypass ${server.keypass}"/>
</java>
<java classname="${is.sun.jdk}" fork="true">
<arg line="-export"/>
diff --git a/examples/webservice-ssl-client-cert/pom.xml b/examples/webservice-ssl-client-cert/pom.xml
index d5abd8d337..0b241d74bc 100644
--- a/examples/webservice-ssl-client-cert/pom.xml
+++ b/examples/webservice-ssl-client-cert/pom.xml
@@ -35,8 +35,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git a/examples/webservice-ssl-client-cert/src/test/conf/server.xml b/examples/webservice-ssl-client-cert/src/test/conf/server.xml
index 8f10df30b9..b8826a3cc7 100644
--- a/examples/webservice-ssl-client-cert/src/test/conf/server.xml
+++ b/examples/webservice-ssl-client-cert/src/test/conf/server.xml
@@ -32,11 +32,15 @@
protocol="org.apache.coyote.http11.Http11NioProtocol"
port="8443" maxThreads="200"
scheme="https" secure="true" SSLEnabled="true"
- keystoreFile="../../../serverStore.jks" keystorePass="keystorePass"
- keyAlias="serveralias" keyPass="serverPassword"
- clientAuth="true" sslProtocol="TLS"
- truststoreType="jks" truststorePass="keystorePass"
- truststoreFile="../../../serverStore.jks"/>
+ clientAuth="true" sslProtocol="TLS">
+ <SSLHostConfig>
+ <Certificate
+ certificateKeystoreFile="../../../serverStore.jks"
+ certificateKeystorePassword="keystorePass"
+ type="RSA"
+ />
+ </SSLHostConfig>
+ </Connector>
<Engine name="Catalina" defaultHost="localhost">
<Host name="localhost" appBase="webapps"