Skip to content

Commit

Permalink
Update SSLCertificateTest.java
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrjohn
chrjohn authored Oct 16, 2024
1 parent 7ad10b9 commit 7d4ff59
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions quickfixj-core/src/test/java/quickfix/mina/ssl/SSLCertificateTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ public void cleanup() {
public void shouldAuthenticateServerCertificate() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand Down Expand Up @@ -137,13 +137,13 @@ public void shouldAuthenticateServerCertificateViaSocksProxy(String proxyVersion
try {
int port = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", port));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", port));

try {
acceptor.start();

SessionSettings initiatorSettings = createInitiatorSettings("single-session/empty.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(port), "JKS", "JKS");
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(port), "JKS", "JKS");

Properties defaults = initiatorSettings.getDefaultProperties();

Expand Down Expand Up @@ -184,14 +184,14 @@ public void shouldAuthenticateServerCertificateViaSocksProxy(String proxyVersion
public void shouldAuthenticateServerNameUsingServerCommonName() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server-cn.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/client-cn.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand Down Expand Up @@ -219,14 +219,14 @@ public void shouldAuthenticateServerNameUsingServerCommonName() throws Exception
public void shouldAuthenticateServerNameUsingSNIExtension() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server-sni.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/client-sni.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand Down Expand Up @@ -255,14 +255,14 @@ public void shouldFailWhenHostnameDoesNotMatchServerName() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();

TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server-bad-cn.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/client-bad-cn.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS", "HTTPS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS", "HTTPS"));

try {
initiator.start();
Expand All @@ -286,14 +286,14 @@ public void shouldFailWhenHostnameDoesNotMatchServerName() throws Exception {
public void shouldAuthenticateServerAndClientCertificates() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server.keystore", true,
"single-session/server.truststore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/server.truststore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/client.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand All @@ -319,14 +319,14 @@ public void shouldAuthenticateServerAndClientCertificates() throws Exception {
public void shouldAuthenticateServerAndClientCertificatesWhenUsingDifferentKeystoreFormats() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server-pkcs12.keystore", true,
"single-session/server-jceks.truststore", CIPHER_SUITES_TLS, "TLSv1.2", "PKCS12",
"single-session/server-jceks.truststore", CIPHER_SUITES_TLS, "TLSv1.3", "PKCS12",
"JCEKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(createInitiatorSettings("single-session/client-jceks.keystore",
"single-session/client-jceks.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA",
"single-session/client-jceks.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA",
Integer.toString(freePort), "JCEKS", "JCEKS"));

try {
Expand Down Expand Up @@ -354,20 +354,20 @@ public void shouldAuthenticateServerAndClientCertificatesForIndividualSessions()
TestAcceptor acceptor = new TestAcceptor(createMultiSessionAcceptorSettings(
"multi-session/server.keystore", true, new String[] { "multi-session/server1.truststore",
"multi-session/server2.truststore", "multi-session/server3.truststore" },
CIPHER_SUITES_TLS, "TLSv1.2"));
CIPHER_SUITES_TLS, "TLSv1.3"));

try {
acceptor.start();

TestInitiator initiator1 = new TestInitiator(
createInitiatorSettings("multi-session/client1.keystore", "multi-session/client1.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU0", "ALFA0", "12340", "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU0", "ALFA0", "12340", "JKS", "JKS"));
TestInitiator initiator2 = new TestInitiator(
createInitiatorSettings("multi-session/client2.keystore", "multi-session/client2.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU1", "ALFA1", "12341", "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU1", "ALFA1", "12341", "JKS", "JKS"));
TestInitiator initiator3 = new TestInitiator(
createInitiatorSettings("multi-session/client3.keystore", "multi-session/client3.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU2", "ALFA2", "12342", "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU2", "ALFA2", "12342", "JKS", "JKS"));

try {
initiator1.start();
Expand Down Expand Up @@ -415,20 +415,20 @@ public void shouldFailIndividualSessionsWhenInvalidCertificatesUsed() throws Exc
TestAcceptor acceptor = new TestAcceptor(createMultiSessionAcceptorSettings(
"multi-session/server.keystore", true, new String[] { "multi-session/server1.truststore",
"multi-session/server2.truststore", "multi-session/server3.truststore" },
CIPHER_SUITES_TLS, "TLSv1.2"));
CIPHER_SUITES_TLS, "TLSv1.3"));

try {
acceptor.start();

TestInitiator initiator1 = new TestInitiator(
createInitiatorSettings("multi-session/client2.keystore", "multi-session/client2.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU0", "ALFA0", "12340", "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU0", "ALFA0", "12340", "JKS", "JKS"));
TestInitiator initiator2 = new TestInitiator(
createInitiatorSettings("multi-session/client1.keystore", "multi-session/client1.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU1", "ALFA1", "12341", "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU1", "ALFA1", "12341", "JKS", "JKS"));
TestInitiator initiator3 = new TestInitiator(
createInitiatorSettings("multi-session/client3.keystore", "multi-session/client3.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU2", "ALFA2", "12342", "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU2", "ALFA2", "12342", "JKS", "JKS"));

try {
initiator1.start();
Expand Down Expand Up @@ -500,14 +500,14 @@ public void shouldFailWhenUsingEmptyServerKeyStore() throws Exception {
public void shouldFailWhenUsingEmptyClientTruststore() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/empty.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand All @@ -531,14 +531,14 @@ public void shouldFailWhenUsingEmptyClientTruststore() throws Exception {
public void shouldFailWhenUsingEmptyServerTrustore() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server.keystore", true,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/client.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand All @@ -562,14 +562,14 @@ public void shouldFailWhenUsingEmptyServerTrustore() throws Exception {
public void shouldFailWhenUsingBadClientCertificate() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server.keystore", true,
"single-session/server.truststore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/server.truststore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/server.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand All @@ -593,14 +593,14 @@ public void shouldFailWhenUsingBadClientCertificate() throws Exception {
public void shouldFailWhenUsingBadServerCertificate() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/client.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand Down Expand Up @@ -631,7 +631,7 @@ public void shouldConnectDifferentTypesOfSessions() throws Exception {

TestInitiator sslInitiator = new TestInitiator(
createInitiatorSettings("single-session/client.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU_SSL", "ALFA_SSL", Integer.toString(sslPort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU_SSL", "ALFA_SSL", Integer.toString(sslPort), "JKS", "JKS"));

TestInitiator nonSslInitiator = new TestInitiator(createInitiatorSettings("ZULU_NON_SSL", "ALFA_NON_SSL", nonSslPort));

Expand Down

0 comments on commit 7d4ff59

Please sign in to comment.