Update SSL tests and certs for Java 11 and TLSv1.3

See gh-14028
This commit is contained in:
Andy Wilkinson
2018-08-10 18:03:56 +01:00
committed by Stephane Nicoll
parent 10fe9ba0d9
commit 9032e5b470
3 changed files with 4 additions and 3 deletions

View File

@@ -426,7 +426,7 @@ public abstract class AbstractServletWebServerFactoryTests {
this.webServer = factory.getWebServer(registration);
this.webServer.start();
TrustStrategy trustStrategy = new SerialNumberValidatingTrustSelfSignedStrategy(
"77e7c302");
"3a3aaec8");
SSLContext sslContext = new SSLContextBuilder()
.loadTrustMaterial(null, trustStrategy).build();
HttpClient httpClient = HttpClients.custom()
@@ -558,7 +558,8 @@ public abstract class AbstractServletWebServerFactoryTests {
throws Exception {
AbstractServletWebServerFactory factory = getFactory();
addTestTxtFile(factory);
factory.setSsl(getSsl(ClientAuth.WANT, "password", "classpath:test.jks"));
factory.setSsl(getSsl(ClientAuth.WANT, "password", "classpath:test.jks", null,
new String[] { "TLSv1.2" }, null));
this.webServer = factory.getWebServer();
this.webServer.start();
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
@@ -692,7 +693,7 @@ public abstract class AbstractServletWebServerFactoryTests {
protected void testRestrictedSSLProtocolsAndCipherSuites(String[] protocols,
String[] ciphers) throws Exception {
AbstractServletWebServerFactory factory = getFactory();
factory.setSsl(getSsl(null, "password", "src/test/resources/test.jks", null,
factory.setSsl(getSsl(null, "password", "src/test/resources/restricted.jks", null,
protocols, ciphers));
this.webServer = factory.getWebServer(
new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello"));