[feat] support Java cipher names on SSLContext#ciphers=

Author: kares

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

@@ -781,7 +781,7 @@ private static Collection<Def> matchingPattern(
     private final static Map<String, Def> Definitions;
     //private final static ArrayList<Def> Ciphers;
     private final static Map<String, Def> CipherNames;
-    private final static Map<String, String> SuiteToOSSL;
+    final static Map<String, String> SuiteToOSSL;
 
     static {
         Definitions = new HashMap<String, Def>( 48, 1 );

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

@@ -83,6 +83,7 @@
 import org.jruby.ext.openssl.x509store.X509Object;
 import org.jruby.ext.openssl.x509store.X509Utils;
 
+import static org.jruby.ext.openssl.CipherStrings.SuiteToOSSL;
 import static org.jruby.ext.openssl.StringHelper.*;
 import static org.jruby.ext.openssl.SSL.*;
 import static org.jruby.ext.openssl.X509Cert._Certificate;
@@ -569,9 +570,13 @@ else if ( ciphers instanceof RubyArray ) {
             StringBuilder cipherStr = new StringBuilder();
             String sep = "";
             for ( int i = 0; i < ciphs.size(); i++ ) {
-                IRubyObject elem = ciphs.eltInternal(i);
+                Object elem = ciphs.eltInternal(i);
                 if (elem instanceof RubyArray) {
                     elem = ((RubyArray) elem).eltInternal(0);
+                } else if (elem instanceof RubyString) {
+                    // NOTE: JOSSL allows to pass in Java cipher names (in an array)
+                    String osslName = SuiteToOSSL.get(((RubyString) elem).asJavaString());
+                    if (osslName != null) elem = osslName;
                 }
                 cipherStr.append(sep).append( elem.toString() );
                 sep = ":";

src/test/ruby/ssl/test_context.rb

@@ -177,7 +177,7 @@ def test_set_ciphers_by_group_name
     context = OpenSSL::SSL::SSLContext.new
     context.ciphers = "AES"
 
-    actual = context.ciphers.map { |cipher| cipher[0]}
+    actual = context.ciphers.map { |cipher| cipher[0] }
     assert actual.include?("ECDHE-RSA-AES128-SHA")
     assert actual.include?("ECDHE-ECDSA-AES128-SHA")
     assert actual.include?("AES128-SHA")
@@ -186,26 +186,43 @@ def test_set_ciphers_by_group_name
   def test_set_ciphers_by_cipher_name
     context = OpenSSL::SSL::SSLContext.new
     context.ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384"
-    actual = context.ciphers.map { |cipher| cipher[0]}
+    actual = context.ciphers.map { |cipher| cipher[0] }
     assert actual.include?("ECDHE-ECDSA-AES128-GCM-SHA256")
     assert actual.include?("ECDHE-ECDSA-AES256-GCM-SHA384")
   end
 
   def test_set_ciphers_by_array_of_names
     context = OpenSSL::SSL::SSLContext.new
     context.ciphers = ["ECDHE-ECDSA-AES128-GCM-SHA256", "ECDHE-ECDSA-AES256-GCM-SHA384"]
-    actual = context.ciphers.map { |cipher| cipher[0]}
+    actual = context.ciphers.map { |cipher| cipher[0] }
     assert actual.include?("ECDHE-ECDSA-AES128-GCM-SHA256")
     assert actual.include?("ECDHE-ECDSA-AES256-GCM-SHA384")
   end
 
   def test_set_ciphers_by_array_of_name_version_bits
     context = OpenSSL::SSL::SSLContext.new
     context.ciphers = [["ECDHE-ECDSA-AES128-GCM-SHA256", "TLSv1.2", 128, 128]]
-    actual = context.ciphers.map { |cipher| cipher[0]}
+    actual = context.ciphers.map { |cipher| cipher[0] }
     assert actual.include?("ECDHE-ECDSA-AES128-GCM-SHA256")
   end
 
+  def test_set_ciphers_by_array_supports_setting_java_names
+    context = OpenSSL::SSL::SSLContext.new
+    context.ciphers = [
+        "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", # Java name
+        "ECDHE-ECDSA-AES256-GCM-SHA384", # Ruby name
+        'TLS_AES_256_GCM_SHA384' # same name in Ruby/Java
+    ]
+    actual = context.ciphers.map { |cipher| cipher[0] }
+    assert actual.include?("ECDHE-ECDSA-AES128-GCM-SHA256"), actual.inspect
+    assert actual.include?("ECDHE-ECDSA-AES256-GCM-SHA384"), actual.inspect
+    assert actual.include?("TLS_AES_256_GCM_SHA384"), actual.inspect
+
+    context.ciphers = [ 'TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384' ]
+    actual = context.ciphers.map { |cipher| cipher[0] }
+    assert_equal actual, ['ECDHE-RSA-AES256-GCM-SHA384']
+  end
+
   def test_set_ciphers_empty_array
     context = OpenSSL::SSL::SSLContext.new
     ex = assert_raise(OpenSSL::SSL::SSLError) do