Skip to content

added cipherSuites parameter #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Khoosham wants to merge 3 commits into
base: master
Choose a base branch
from
Open

added cipherSuites parameter #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9940b6f
added new parameter String[] cipherSuites to makeSecure
Khoosham Sep 25, 2016
91d86cd
added Cipher Suites
Khoosham Sep 25, 2016
96e69b6
Update SecureServerSocketFactory.java
Khoosham Sep 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/java/org/nanohttpd/protocols/http/NanoHTTPD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,8 @@ public IFactory<ITempFileManager> getTempFileManagerFactory() {
/**
* Call before start() to serve over HTTPS instead of HTTP
*/
public void makeSecure(SSLServerSocketFactory sslServerSocketFactory, String[] sslProtocols) {
this.serverSocketFactory = new SecureServerSocketFactory(sslServerSocketFactory, sslProtocols);
public void makeSecure(SSLServerSocketFactory sslServerSocketFactory, String[] sslProtocols, String[] cipherSuites) {
this.serverSocketFactory = new SecureServerSocketFactory(sslServerSocketFactory, sslProtocols, cipherSuites);
}

/**
Expand Down
9 changes: 8 additions & 1 deletion core/src/main/java/org/nanohttpd/protocols/http/sockets/SecureServerSocketFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@ public class SecureServerSocketFactory implements IFactoryThrowing<ServerSocket,
private SSLServerSocketFactory sslServerSocketFactory;

private String[] sslProtocols;
private String[] cipherSuites;

public SecureServerSocketFactory(SSLServerSocketFactory sslServerSocketFactory, String[] sslProtocols) {
public SecureServerSocketFactory(SSLServerSocketFactory sslServerSocketFactory, String[] sslProtocols, String[] cipherSuites) {
this.sslServerSocketFactory = sslServerSocketFactory;
this.sslProtocols = sslProtocols;
this.cipherSuites = cipherSuites;
}

@Override
Expand All @@ -64,6 +66,11 @@ public ServerSocket create() throws IOException {
} else {
ss.setEnabledProtocols(ss.getSupportedProtocols());
}
if (this.cipherSuites != null) {
ss.setEnabledCipherSuites(this.cipherSuites);
} else {
ss.setEnabledCipherSuites(ss.getSupportedCipherSuites());
}
ss.setUseClientMode(false);
ss.setWantClientAuth(false);
ss.setNeedClientAuth(false);
Expand Down