[fix] keep curve name when group is set into another key

Author: kares

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

@@ -227,10 +227,14 @@ public PKeyEC(Ruby runtime, RubyClass type) {
 
     private String curveName;
 
-    private String getCurveName() { return curveName; }
+    private String getCurveName() {
+        if (curveName == null && group != null) {
+            curveName = group.getCurveName();
+        }
+        return curveName;
+    }
 
     private ECNamedCurveParameterSpec getParameterSpec() {
-        assert curveName != null;
         return ECNamedCurveTable.getParameterSpec(getCurveName());
     }
 
@@ -836,20 +840,20 @@ static void createGroup(final Ruby runtime, final RubyClass EC, final RubyClass
             Group.defineAnnotatedMethods(Group.class);
         }
 
-        private transient PKeyEC key;
         private transient ECParameterSpec paramSpec;
 
         private PointConversion conversionForm = PointConversion.UNCOMPRESSED;
 
-        private RubyString curve_name;
+        private String curveName;
+        private RubyString impl_curve_name;
 
         public Group(Ruby runtime, RubyClass type) {
             super(runtime, type);
         }
 
         Group(Ruby runtime, PKeyEC key) {
             this(runtime, _EC(runtime).getClass("Group"));
-            this.key = key;
+            setCurveName(runtime, key.getCurveName());
         }
 
         @JRubyMethod(rest = true, visibility = Visibility.PRIVATE)
@@ -860,19 +864,21 @@ public IRubyObject initialize(final ThreadContext context, final IRubyObject[] a
                 IRubyObject arg = args[0];
 
                 if ( arg instanceof Group ) {
-                    this.curve_name = ((Group) arg).implCurveName(runtime);
+                    this.curveName = ((Group) arg).curveName;
                     return this;
                 }
 
-                this.curve_name = arg.convertToString();
+                this.impl_curve_name = arg.convertToString();
             }
             return this;
         }
 
         private String getCurveName() {
-            if (key != null) return key.getCurveName();
-            assert curve_name != null;
-            return curve_name.toString();
+            if (curveName == null) {
+                assert impl_curve_name != null;
+                return impl_curve_name.asJavaString();
+            }
+            return curveName;
         }
 
         @Override
@@ -892,16 +898,21 @@ public IRubyObject curve_name(final ThreadContext context) {
         }
 
         private RubyString implCurveName(final Ruby runtime) {
-            if (curve_name == null) {
-                assert key != null;
-                String prefix, curveName = key.getCurveName();
-                // BC 1.54: "brainpoolP512t1" 1.55: "brainpoolp512t1"
-                if (curveName.startsWith(prefix = "brainpoolp")) {
-                    curveName = "brainpoolP" + curveName.substring(prefix.length());
-                }
-                curve_name = RubyString.newString(runtime, curveName);
+            if (impl_curve_name == null && curveName != null) {
+                setCurveName(runtime, curveName);
             }
-            return curve_name;
+            return impl_curve_name;
+        }
+
+        private void setCurveName(final Ruby runtime, String curveName) {
+            assert curveName != null;
+            this.curveName = curveName;
+            String prefix;
+            // BC 1.54: "brainpoolP512t1" 1.55: "brainpoolp512t1"
+            if (curveName.startsWith(prefix = "brainpoolp")) {
+                curveName = "brainpoolP" + curveName.substring(prefix.length());
+            }
+            impl_curve_name = RubyString.newString(runtime, curveName);
         }
 
         @JRubyMethod
@@ -956,11 +967,7 @@ public RubyString to_pem(final ThreadContext context, final IRubyObject[] args)
 
         private ECParameterSpec getParamSpec() {
             if (paramSpec == null) {
-                if (key != null) {
-                    return paramSpec = key.getParamSpec();
-                }
-                assert curve_name != null;
-                return paramSpec = PKeyEC.getParamSpec(getCurveName());
+                paramSpec = PKeyEC.getParamSpec(getCurveName());
             }
             return paramSpec;
         }

src/test/ruby/ec/test_ec.rb

@@ -22,11 +22,11 @@ def test_ec_key
 
     # PKey is immutable in OpenSSL >= 3.0; constructing an empty EC object is deprecated
     #if !openssl?(3, 0, 0)
-    #   key2 = OpenSSL::PKey::EC.new
-    #   key2.group = key1.group
-    #   key2.private_key = key1.private_key
-    #   key2.public_key = key1.public_key
-    #   assert_equal key1.to_der, key2.to_der
+      key2 = OpenSSL::PKey::EC.new
+      key2.group = key1.group
+      key2.private_key = key1.private_key
+      key2.public_key = key1.public_key
+      assert_equal key1.to_der, key2.to_der
     #end
 
     key3 = OpenSSL::PKey::EC.new(key1)