Skip to content

Commit 4478639

Browse files
authored
Merge branch 'master' into new-thread-iam-token
2 parents d532aa6 + 459626e commit 4478639

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/com/ibm/cloud/sdk/core/http/HttpClientSingleton.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ private void setupTLSProtocol(final OkHttpClient.Builder builder) {
186186

187187
X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
188188

189-
System.setProperty("com.ibm.jsse2.overrideDefaultTLS", "true");
190-
SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
189+
// On IBM JDKs this gets only TLSv1
190+
SSLContext sslContext = SSLContext.getInstance("TLS");
191191

192192
sslContext.init(null, new TrustManager[] { trustManager }, null);
193193
SSLSocketFactory sslSocketFactory = new DelegatingSSLSocketFactory(sslContext.getSocketFactory()) {

0 commit comments

Comments
 (0)