normalize "brainpoolP512t1" curve name for BC 1.55 compatibility

kares · kares · commit 64bb86f7ecc6 · 2016-11-04T16:18:57.000+01:00
diff --git a/src/main/java/org/jruby/ext/openssl/PKeyEC.java b/src/main/java/org/jruby/ext/openssl/PKeyEC.java
@@ -688,7 +688,12 @@ public IRubyObject op_equal(final ThreadContext context, final IRubyObject obj)
         @JRubyMethod
         public IRubyObject curve_name(final ThreadContext context) {
             if (curve_name == null) {
-                curve_name = RubyString.newString(context.runtime, key.getCurveName());
+                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(context.runtime, curveName);
             }
             return curve_name.dup();
         }

Original file line number	Diff line number	Diff line change
`@@ -688,7 +688,12 @@ public IRubyObject op_equal(final ThreadContext context, final IRubyObject obj)`
`688`	`688`	`@JRubyMethod`
`689`	`689`	`public IRubyObject curve_name(final ThreadContext context) {`
`690`	`690`	`if (curve_name == null) {`
`691`		`- curve_name = RubyString.newString(context.runtime, key.getCurveName());`
	`691`	`+ String prefix, curveName = key.getCurveName();`
	`692`	`+ // BC 1.54: "brainpoolP512t1" 1.55: "brainpoolp512t1"`
	`693`	`+ if (curveName.startsWith(prefix = "brainpoolp")) {`
	`694`	`+ curveName = "brainpoolP" + curveName.substring(prefix.length());`
	`695`	`+ }`
	`696`	`+ curve_name = RubyString.newString(context.runtime, curveName);`
`692`	`697`	`}`
`693`	`698`	`return curve_name.dup();`
`694`	`699`	`}`