Skip to content

Commit

Permalink
Temporal solution - s1asCN property was already removed
Browse files Browse the repository at this point in the history
- it also expected that the server certificate was created with the same CN,
  which wasn't always true, so the previous was not more reliable than this.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
  • Loading branch information
dmatej committed Nov 13, 2023
1 parent 16ce400 commit e369d97
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<java classname="devtests.security.WebSSLClient">
<sysproperty key="javax.net.debug1" value="ssl,handshake,data,trustmanager" />
<sysproperty key="sun.security.ssl.allowUnsafeRenegotiation" value="true" />
<arg value="${s1asCN}"/>
<arg value="localhost"/>
<arg value="${https.port}"/>
<arg value="${contextroot}"/>
<arg value="${mykeystore.db.file}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@
<!-- =============================================== -->
<target name="run-standalone-client" depends="init-common">
<property name="jndi.name" value="SSLconverter"/>
<property name="provider.url" value="iiop://${s1asCN}:${orb.port}"/>
<property name="provider.url" value="iiop://localhost:${orb.port}"/>
<property name="ctxfactory"
value="com.sun.enterprise.naming.SerialInitContextFactory"/>
<echo message="provider.url used is ${provider.url}"/>
<java classname="${test.client}"
classpath="${s1astest.classpath}:${env.S1AS_HOME}/lib/appserv-rt.jar:${assemble.dir}/${appname}AppClient.jar"
failonerror="true" fork="true">
<jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${s1asCN}"/>
<jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=localhost"/>
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
<jvmarg value="-Djavax.net.ssl.keyStore=${mykeystore.db.file}"/>
<jvmarg value="-Djavax.net.ssl.trustStore=${mytruststore.db.file}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<java classname="devtests.security.WebSSLClient">
<sysproperty key="javax.net.debug1" value="ssl,handshake,data,trustmanager" />
<sysproperty key="sun.security.ssl.allowUnsafeRenegotiation" value="true" />
<arg value="${s1asCN}"/>
<arg value="localhost"/>
<arg value="${https.port}"/>
<arg value="${contextroot}"/>
<arg value="${mykeystore.db.file}"/>
Expand Down

0 comments on commit e369d97

Please sign in to comment.