Skip to content

Commit 98e4360

Browse files
committed
[refactor] we can now safely assume we're always on Java >= 7
1 parent 8376aaa commit 98e4360

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/main/java/org/jruby/ext/openssl/SSLContext.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,7 @@ public class SSLContext extends RubyObject {
123123
SSL_VERSION_OSSL2JSSE.put("SSLv23_server", "SSL");
124124
SSL_VERSION_OSSL2JSSE.put("SSLv23_client", "SSL");
125125

126-
if ( OpenSSL.javaVersion7(true) ) { // >= 1.7
127-
ENABLED_PROTOCOLS.put("SSL", new String[] { "SSLv2", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2" });
128-
} else {
129-
ENABLED_PROTOCOLS.put("SSL", new String[] { "SSLv2", "SSLv3", "TLSv1" });
130-
}
126+
ENABLED_PROTOCOLS.put("SSL", new String[] { "SSLv2", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2" });
131127

132128
// Historically we were ahead of MRI to support TLS
133129
// ... thus the non-standard names version names :

0 commit comments

Comments
 (0)