Prefer ASN1*Strings over DER*Strings in ASN1.java

justinstoller · justinstoller · commit b4a533a3bb4d · 2024-04-11T11:17:06.000-07:00
diff --git a/src/main/java/org/jruby/ext/openssl/ASN1.java b/src/main/java/org/jruby/ext/openssl/ASN1.java
@@ -1697,13 +1697,13 @@ ASN1Encodable toASN1(final ThreadContext context) {
             }
 
             if ( type == DERGeneralString.class ) {
-                return new DERGeneralString( val.asString().toString() );
+                return ASN1GeneralString.getInstance( val.asString().getBytes() );
             }
             if ( type == DERVisibleString.class ) {
-                return new DERVisibleString( val.asString().toString() );
+                return ASN1VisibleString.getInstance( val.asString().getBytes() );
             }
             if ( type == DERNumericString.class ) {
-                return new DERNumericString( val.asString().toString() );
+                return ASN1NumericString.getInstance( val.asString().getBytes() );
             }
 
             if ( val instanceof RubyString ) {

Original file line number	Diff line number	Diff line change
`@@ -1697,13 +1697,13 @@ ASN1Encodable toASN1(final ThreadContext context) {`
`1697`	`1697`	`}`
`1698`	`1698`
`1699`	`1699`	`if ( type == DERGeneralString.class ) {`
`1700`		`- return new DERGeneralString( val.asString().toString() );`
	`1700`	`+ return ASN1GeneralString.getInstance( val.asString().getBytes() );`
`1701`	`1701`	`}`
`1702`	`1702`	`if ( type == DERVisibleString.class ) {`
`1703`		`- return new DERVisibleString( val.asString().toString() );`
	`1703`	`+ return ASN1VisibleString.getInstance( val.asString().getBytes() );`
`1704`	`1704`	`}`
`1705`	`1705`	`if ( type == DERNumericString.class ) {`
`1706`		`- return new DERNumericString( val.asString().toString() );`
	`1706`	`+ return ASN1NumericString.getInstance( val.asString().getBytes() );`
`1707`	`1707`	`}`
`1708`	`1708`
`1709`	`1709`	`if ( val instanceof RubyString ) {`