[fix] raise ASN1Error when unused_bits out of range

kares · kares · commit 86daed3f3270 · 2025-01-09T14:21:33.000+01:00
diff --git a/src/main/java/org/jruby/ext/openssl/ASN1.java b/src/main/java/org/jruby/ext/openssl/ASN1.java
@@ -1683,7 +1683,11 @@ private ASN1Encodable toASN1Primitive(final ThreadContext context) {
                 if (unused_bits != null) {
                     padBits = unused_bits.convertToInteger("to_i").getIntValue();
                 }
-                return new DERBitString(data, padBits);
+                try {
+                    return new DERBitString(data, padBits);
+                } catch (IllegalArgumentException e) {
+                    throw newASN1Error(context.runtime, e.getMessage());
+                }
             }
             if ( type == DERIA5String.class ) {
                 return new DERIA5String( val.asString().toString() );
diff --git a/src/test/ruby/test_asn1.rb b/src/test/ruby/test_asn1.rb
@@ -1180,13 +1180,11 @@ def test_bitstring
       OpenSSL::ASN1.decode(B(%w{ 03 03 08 FF 00 }))
     }
 
-    # TODO: Import Issue
-    # exception was expected but none was thrown.
-    #assert_raise(OpenSSL::ASN1::ASN1Error) {
-    #  obj = OpenSSL::ASN1::BitString.new(B(%w{ FF FF }))
-    #  obj.unused_bits = 8
-    #  obj.to_der
-    #}
+    assert_raise(OpenSSL::ASN1::ASN1Error) {
+      obj = OpenSSL::ASN1::BitString.new(B(%w{ FF FF }))
+      obj.unused_bits = 8
+      obj.to_der
+    }
   end
 
   def test_bit_string_unused_length

Original file line number	Diff line number	Diff line change
`@@ -1683,7 +1683,11 @@ private ASN1Encodable toASN1Primitive(final ThreadContext context) {`
`1683`	`1683`	`if (unused_bits != null) {`
`1684`	`1684`	`padBits = unused_bits.convertToInteger("to_i").getIntValue();`
`1685`	`1685`	`}`
`1686`		`- return new DERBitString(data, padBits);`
	`1686`	`+ try {`
	`1687`	`+ return new DERBitString(data, padBits);`
	`1688`	`+ } catch (IllegalArgumentException e) {`
	`1689`	`+ throw newASN1Error(context.runtime, e.getMessage());`
	`1690`	`+ }`
`1687`	`1691`	`}`
`1688`	`1692`	`if ( type == DERIA5String.class ) {`
`1689`	`1693`	`return new DERIA5String( val.asString().toString() );`