now that we've matched w MRI's SSLContext::METHODS don't report custom ones

Author: kares

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

@@ -171,8 +171,11 @@ public static void createSSLContext(final Ruby runtime, final RubyModule SSL) {
 
         final Set<String> methodKeys = SSL_VERSION_OSSL2JSSE.keySet();
         final RubyArray methods = runtime.newArray( methodKeys.size() );
-        for ( String method : methodKeys ) {
-            methods.append( runtime.newSymbol(method) );
+        for ( final String method : methodKeys ) {
+            if ( method.indexOf('.') == -1 ) {
+                // do not "officially" report TLSv1.1 and TLSv1.2
+                methods.append( runtime.newSymbol(method) );
+            }
         }
         SSLContext.defineConstant("METHODS", methods);
         // in 1.8.7 as well as 1.9.3 :
@@ -416,7 +419,7 @@ public IRubyObject setup(final ThreadContext context) {
     }
 
     @JRubyMethod
-    public IRubyObject ciphers(final ThreadContext context) {
+    public RubyArray ciphers(final ThreadContext context) {
         return matchedCiphers(context);
     }
 

src/test/ruby/ssl/test_context.rb

@@ -4,6 +4,13 @@
 class TestSSLContext < TestCase
   #include SSLTestHelper
 
+  def test_methods
+    methods = OpenSSL::SSL::SSLContext::METHODS
+    assert methods.include?(:'SSLv3')
+    assert methods.include?(:'TLSv1_1')
+    assert ! methods.include?(:'TLSv1.1')
+  end
+
   def test_context_set_ssl_version
     context = OpenSSL::SSL::SSLContext.new
     context.ssl_version = "TLSv1"