github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-23 01:29:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

minor code quality issues corrected

Browse Source
This commit is contained in:
Jeremy Long
2016-07-23 06:50:11 -04:00
parent 7cf040653f
commit 4894372eee
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/SSLSocketFactoryEx.java
View File

@@ -14,14 +14,24 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* This class is used to enable additional ciphers used by the SSL Socket. This
* is specifically because the NVD stopped supporting TLS 1.0 and Java 6 and 7
* clients by default were unable to connect to download the NVD data feeds.
*
* The following code was copied from * The following code was copied from
* http://stackoverflow.com/questions/1037590/which-cipher-suites-to-enable-for-ssl-socket/23365536#23365536 * http://stackoverflow.com/questions/1037590/which-cipher-suites-to-enable-for-ssl-socket/23365536#23365536
* *
*/ */
class SSLSocketFactoryEx extends SSLSocketFactory { class SSLSocketFactoryEx extends SSLSocketFactory {
/**
* The Logger for use throughout the class.
*/
private static final Logger LOGGER = LoggerFactory.getLogger(SSLSocketFactoryEx.class);
public SSLSocketFactoryEx() throws NoSuchAlgorithmException, KeyManagementException { public SSLSocketFactoryEx() throws NoSuchAlgorithmException, KeyManagementException {
initSSLSocketFactoryEx(null, null, null); initSSLSocketFactoryEx(null, null, null);
} }
@@ -52,6 +62,7 @@ class SSLSocketFactoryEx extends SSLSocketFactory {
return m_protocols; return m_protocols;
} }
@Override
public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException { public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
SSLSocketFactory factory = m_ctx.getSocketFactory(); SSLSocketFactory factory = m_ctx.getSocketFactory();
SSLSocket ss = (SSLSocket) factory.createSocket(s, host, port, autoClose); SSLSocket ss = (SSLSocket) factory.createSocket(s, host, port, autoClose);
@@ -142,7 +153,7 @@ class SSLSocketFactoryEx extends SSLSocketFactory {
try { try {
socket.close(); socket.close();
} catch (IOException ex) { } catch (IOException ex) {
//ignore LOGGER.trace("Error closing socket", ex);
} }
} }
} }
@@ -203,13 +214,14 @@ class SSLSocketFactoryEx extends SSLSocketFactory {
"TLS_RSA_WITH_AES_128_CBC_SHA" "TLS_RSA_WITH_AES_128_CBC_SHA"
}; };
String[] availableCiphers = null; String[] availableCiphers;
try { try {
SSLSocketFactory factory = m_ctx.getSocketFactory(); SSLSocketFactory factory = m_ctx.getSocketFactory();
availableCiphers = factory.getSupportedCipherSuites(); availableCiphers = factory.getSupportedCipherSuites();
Arrays.sort(availableCiphers); Arrays.sort(availableCiphers);
} catch (Exception e) { } catch (Exception e) {
LOGGER.debug("Error retrieving ciphers", e);
return new String[]{ return new String[]{
"TLS_DHE_DSS_WITH_AES_128_CBC_SHA", "TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
"TLS_DHE_DSS_WITH_AES_256_CBC_SHA", "TLS_DHE_DSS_WITH_AES_256_CBC_SHA",