more ssl_version= compatibility fixes that match MRI (closing jruby/jruby#1736)

Author: kares

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

@@ -56,7 +56,7 @@
 import org.jruby.RubyModule;
 import org.jruby.RubyNumeric;
 import org.jruby.RubyObject;
-import org.jruby.RubyString;
+import org.jruby.RubySymbol;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.common.IRubyWarnings.ID;
 import org.jruby.runtime.Arity;
@@ -474,16 +474,16 @@ else if ( ciphers instanceof RubyArray ) {
     @JRubyMethod(name = "ssl_version=")
     public IRubyObject set_ssl_version(IRubyObject version) {
         final String versionStr;
-        if ( version instanceof RubyString ) {
-            versionStr = version.asString().toString();
-        } else {
+        if ( version instanceof RubySymbol ) {
             versionStr = version.toString();
+        } else {
+            versionStr = version.convertToString().toString();
         }
-        final String mapped = SSL_VERSION_OSSL2JSSE.get(versionStr);
-        if ( mapped == null ) {
-            throw newSSLError(getRuntime(), String.format("unknown SSL method `%s'.", versionStr));
+        final String protocol = SSL_VERSION_OSSL2JSSE.get(versionStr);
+        if ( protocol == null ) {
+            throw getRuntime().newArgumentError("unknown SSL method `"+ versionStr +"'");
         }
-        protocol = mapped;
+        this.protocol = protocol;
         protocolForServer = ! versionStr.endsWith("_client");
         protocolForClient = ! versionStr.endsWith("_server");
         return version;

src/test/ruby/ssl/test_context.rb

@@ -6,20 +6,32 @@ class TestSSLContext < TestCase
 
   def test_context_set_ssl_version
     context = OpenSSL::SSL::SSLContext.new
-    context.ssl_version = :"TLSv1_1"
+    context.ssl_version = "TLSv1"
+
+    context = OpenSSL::SSL::SSLContext.new
+    context.ssl_version = :SSLv3
+
+    context = OpenSSL::SSL::SSLContext.new
+    context.ssl_version = :"TLSv1_1" unless RUBY_VERSION < '2.0'
     #assert_equal :TLSv1_1, context.ssl_version
 
     context = OpenSSL::SSL::SSLContext.new
-    context.ssl_version = "TLSv1_1"
+    context.ssl_version = "TLSv1_1" unless RUBY_VERSION < '2.0'
 
     context = OpenSSL::SSL::SSLContext.new
     context.ssl_version = "TLSv1.1" if defined? JRUBY_VERSION
 
     context = OpenSSL::SSL::SSLContext.new
-    context.ssl_version = :TLSv1_2
+    context.ssl_version = :TLSv1_2 unless RUBY_VERSION < '2.0'
 
     context = OpenSSL::SSL::SSLContext.new
     context.ssl_version = "TLSv1.2" if defined? JRUBY_VERSION
+
+    context = OpenSSL::SSL::SSLContext.new
+    assert_raises ArgumentError do
+      context.ssl_version = "TLSv42" # ArgumentError: unknown SSL method `TLSv42'
+    end
+    assert_raises(TypeError) { context.ssl_version = 12 }
   end
 
 end