Merge pull request #96 from CBonnell/master

rhenium · web-flow · commit 46674c38caca · 2016-12-30T02:25:19.000+09:00
Fix for ASN1::Constructive 'each' implementation
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
@@ -1291,7 +1291,7 @@ ossl_asn1cons_to_der(VALUE self)
 static VALUE
 ossl_asn1cons_each(VALUE self)
 {
-    rb_funcall(ossl_asn1_get_value(self), id_each, 0);
+    rb_block_call(ossl_asn1_get_value(self), id_each, 0, 0, 0, 0);
 
     return self;
 }
diff --git a/test/test_asn1.rb b/test/test_asn1.rb
@@ -566,6 +566,13 @@ def test_decode_constructed_overread
     assert_equal 17, ret[0][6]
   end
 
+  def test_constructive_each
+    data = [OpenSSL::ASN1::Integer.new(0), OpenSSL::ASN1::Integer.new(1)]
+    seq = OpenSSL::ASN1::Sequence.new data
+
+    assert_equal data, seq.entries
+  end
+
   private
 
   def assert_universal(tag, asn1)

Original file line number	Diff line number	Diff line change
`@@ -1291,7 +1291,7 @@ ossl_asn1cons_to_der(VALUE self)`
`1291`	`1291`	`static VALUE`
`1292`	`1292`	`ossl_asn1cons_each(VALUE self)`
`1293`	`1293`	`{`
`1294`		`-rb_funcall(ossl_asn1_get_value(self), id_each, 0);`
	`1294`	`+rb_block_call(ossl_asn1_get_value(self), id_each, 0, 0, 0, 0);`
`1295`	`1295`
`1296`	`1296`	`return self;`
`1297`	`1297`	`}`