Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2016-07-21 13:02:57 +10:00
parent 6e4abb3339 5718726a8c
commit f902181a83
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnectionFactory.java
View File

@ -98,9 +98,11 @@ public abstract class NegotiatingServerConnectionFactory extends AbstractConnect
{ {
// Generate list of protocols that we can negotiate // Generate list of protocols that we can negotiate
negotiated = connector.getProtocols().stream() negotiated = connector.getProtocols().stream()
.map(p->connector.getConnectionFactory(p)) .filter(p->
.filter(f->!(f instanceof SslConnectionFactory)&&!(f instanceof NegotiatingServerConnectionFactory)) {
.map(p->p.getProtocol()) ConnectionFactory f=connector.getConnectionFactory(p);
return !(f instanceof SslConnectionFactory)&&!(f instanceof NegotiatingServerConnectionFactory);
})
.collect(Collectors.toList()); .collect(Collectors.toList());
} }

5
jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
View File

@ -249,10 +249,7 @@ public class SslContextFactory extends AbstractLifeCycle
{ {
setTrustAll(trustAll); setTrustAll(trustAll);
addExcludeProtocols("SSL", "SSLv2", "SSLv2Hello", "SSLv3"); addExcludeProtocols("SSL", "SSLv2", "SSLv2Hello", "SSLv3");
setExcludeCipherSuites( setExcludeCipherSuites("^.*_(MD5|SHA|SHA1)$");
"^.*_RSA_.*_(MD5|SHA|SHA1)$",
"SSL_DHE_DSS_WITH_DES_CBC_SHA",
"SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA");
} }
/** /**