Skip to content

Enable TLSv1.2 only if Android API is 16+, otherwise use TLSv1. #3

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
frankgyw wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Enable TLSv1.2 only if Android API is 16+, otherwise use TLSv1. #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions wvalib/src/main/java/com/digi/wva/internal/HttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,10 @@ public final void onJsonParseError(JSONException error, String rawBody) {

public class TLSSocketFactory extends SSLSocketFactory {
private SSLSocketFactory internalSSLSocketFactory;
private String supportedProtocol;

public TLSSocketFactory() throws KeyManagementException, NoSuchAlgorithmException {
SSLContext context = SSLContext.getInstance("TLS");
public TLSSocketFactory(String protocol) throws KeyManagementException, NoSuchAlgorithmException {
SSLContext context = SSLContext.getInstance(protocol);
context.init(null, new X509TrustManager[]{new X509TrustManager() {
@Override
public X509Certificate[] getAcceptedIssuers() {
Expand All @@ -193,6 +194,7 @@ public void checkClientTrusted(X509Certificate[] chain, String authType)
}
}}, null);
internalSSLSocketFactory = context.getSocketFactory();
supportedProtocol = protocol;
}

@Override
Expand Down Expand Up @@ -232,7 +234,7 @@ public Socket createSocket(InetAddress address, int port, InetAddress localAddre

private Socket enableTLSOnSocket(Socket socket) {
if(socket != null && (socket instanceof SSLSocket)) {
((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.2"});
((SSLSocket)socket).setEnabledProtocols(new String[] { supportedProtocol });
}
return socket;
}
Expand All @@ -247,7 +249,9 @@ private SSLSocketFactory makeSSLSocketFactory() {
SSLSocketFactory factory = null;

try {
factory = new TLSSocketFactory();
// Enable TLSv1.2 protocol only if the Android API is 16+, otherwise use TLSv1.
int currentAPIVersion = android.os.Build.VERSION.SDK_INT;
factory = (currentAPIVersion >= android.os.Build.VERSION_CODES.JELLY_BEAN) ? new TLSSocketFactory("TLSv1.2") : new TLSSocketFactory("TLSv1");
} catch (NoSuchAlgorithmException e) {
} catch (KeyManagementException e) {
}
Expand Down