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

justinstoller · justinstoller · commit 589bcd00e6e4 · 2023-10-24T11:51:44.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
@@ -1695,13 +1695,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
`@@ -1695,13 +1695,13 @@ ASN1Encodable toASN1(final ThreadContext context) {`
`1695`	`1695`	`}`
`1696`	`1696`
`1697`	`1697`	`if ( type == DERGeneralString.class ) {`
`1698`		`- return new DERGeneralString( val.asString().toString() );`
	`1698`	`+ return ASN1GeneralString.getInstance( val.asString().getBytes() );`
`1699`	`1699`	`}`
`1700`	`1700`	`if ( type == DERVisibleString.class ) {`
`1701`		`- return new DERVisibleString( val.asString().toString() );`
	`1701`	`+ return ASN1VisibleString.getInstance( val.asString().getBytes() );`
`1702`	`1702`	`}`
`1703`	`1703`	`if ( type == DERNumericString.class ) {`
`1704`		`- return new DERNumericString( val.asString().toString() );`
	`1704`	`+ return ASN1NumericString.getInstance( val.asString().getBytes() );`
`1705`	`1705`	`}`
`1706`	`1706`
`1707`	`1707`	`if ( val instanceof RubyString ) {`