diff options
author | Greg Wilkins | 2016-01-14 00:00:06 +0000 |
---|---|---|
committer | Greg Wilkins | 2016-01-14 00:00:06 +0000 |
commit | c5cbc64e7799409101e6dd28c143dbea397724cf (patch) | |
tree | 6505450207f77caf51950534b5c5cfa22e7fae82 /jetty-server/src/test | |
parent | 122ac9c4459818313bed8bf1663680b6cc93f29d (diff) | |
parent | 6e85554aadf6bb0e4904a93f0841c9d23c346efc (diff) | |
download | org.eclipse.jetty.project-c5cbc64e7799409101e6dd28c143dbea397724cf.tar.gz org.eclipse.jetty.project-c5cbc64e7799409101e6dd28c143dbea397724cf.tar.xz org.eclipse.jetty.project-c5cbc64e7799409101e6dd28c143dbea397724cf.zip |
Merge remote-tracking branch 'origin/jetty-9.3.x'
Diffstat (limited to 'jetty-server/src/test')
-rw-r--r-- | jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java | 6 | ||||
-rw-r--r-- | jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java index f353e7f09a..2d23ff564b 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java @@ -27,6 +27,7 @@ import java.net.Socket; import java.nio.charset.StandardCharsets; import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLEngine; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -36,6 +37,7 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; +import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.junit.Test; @@ -58,8 +60,8 @@ public class SSLCloseTest server.addConnector(connector); server.setHandler(new WriteHandler()); server.start(); - - SSLContext ctx=SSLContext.getInstance("SSLv3"); + + SSLContext ctx=SSLContext.getInstance("TLSv1.2"); ctx.init(null,SslContextFactory.TRUST_ALL_CERTS,new java.security.SecureRandom()); int port=connector.getLocalPort(); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java index 9b76d0e702..a010774b15 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java @@ -189,7 +189,7 @@ public class SSLEngineTest Socket[] client=new Socket[numConns]; - SSLContext ctx=SSLContext.getInstance("SSLv3"); + SSLContext ctx=SSLContext.getInstance("TLSv1.2"); ctx.init(null,SslContextFactory.TRUST_ALL_CERTS,new java.security.SecureRandom()); int port=connector.getLocalPort(); |