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

Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 

Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
This commit is contained in:
Greg Wilkins 2015-05-21 01:54:07 +10:00
parent bd27e7d2d4 1a666e1bd2
commit aa8ad7d4f4
1 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,6 +240,8 @@ public class SslContextFactory extends AbstractLifeCycle
protected Factory _factory; protected Factory _factory;
/** /**
* Construct an instance of SslContextFactory * Construct an instance of SslContextFactory
* Default constructor for use in XmlConfiguration files * Default constructor for use in XmlConfiguration files
@ -267,7 +269,7 @@ public class SslContextFactory extends AbstractLifeCycle
"SSL_RSA_EXPORT_WITH_DES40_CBC_SHA", "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
"SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA", "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
"SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"); "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA");
} }
/** /**
* Construct an instance of SslContextFactory * Construct an instance of SslContextFactory
@ -365,7 +367,7 @@ public class SslContextFactory extends AbstractLifeCycle
_certAliases.clear(); _certAliases.clear();
if (keyStore!=null) if (keyStore!=null)
{ {
loop: for (String alias : Collections.list(keyStore.aliases())) for (String alias : Collections.list(keyStore.aliases()))
{ {
Certificate certificate = keyStore.getCertificate(alias); Certificate certificate = keyStore.getCertificate(alias);
if ("X.509".equals(certificate.getType())) if ("X.509".equals(certificate.getType()))
@ -377,7 +379,7 @@ public class SslContextFactory extends AbstractLifeCycle
{ {
boolean[] b=x509.getKeyUsage(); boolean[] b=x509.getKeyUsage();
if (b[KEY_USAGE__KEY_CERT_SIGN]) if (b[KEY_USAGE__KEY_CERT_SIGN])
continue loop; continue;
} }
// Look for alternative name extensions // Look for alternative name extensions
@ -1709,7 +1711,7 @@ public class SslContextFactory extends AbstractLifeCycle
// If we don't have a SNI name, or didn't see any certificate aliases, // If we don't have a SNI name, or didn't see any certificate aliases,
// just say true as it will either somehow work or fail elsewhere // just say true as it will either somehow work or fail elsewhere
if (_name==null || _certAliases.size()==0) if (_certAliases.size()==0)
return true; return true;
// Try an exact match // Try an exact match