1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openssl: use ASN1_ENUMERATED_to_BN() if needed

Browse Source 
* ext/openssl/ossl_asn1.c (asn1integer_to_num): Use
  ASN1_ENUMERATED_to_BN() to convert an ASN1_ENUMERATED to a BN.
  Starting from OpenSSL 1.1.0, ASN1_INTEGER_to_BN() rejects
  non-ASN1_INTEGER objects. The format of INTEGER and ENUMERATED are
  almost identical so they behaved in the same way in OpenSSL <= 1.0.2.
  [ruby-core:75225] [Feature #12324]

* test/openssl/test_asn1.rb (test_decode_enumerated): Test that it
  works.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
rhe 2016-06-09 12:42:08 +00:00
parent c01e473863
commit f9843bc4dc
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Thu Jun 9 21:42:00 2016 Kazuki Yamaguchi <k@rhe.jp>
* ext/openssl/ossl_asn1.c (asn1integer_to_num): Use
ASN1_ENUMERATED_to_BN() to convert an ASN1_ENUMERATED to a BN.
Starting from OpenSSL 1.1.0, ASN1_INTEGER_to_BN() rejects
non-ASN1_INTEGER objects. The format of INTEGER and ENUMERATED are
almost identical so they behaved in the same way in OpenSSL <= 1.0.2.
[ruby-core:75225] [Feature #12324]
* test/openssl/test_asn1.rb (test_decode_enumerated): Test that it
works.
Thu Jun 9 21:10:04 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> Thu Jun 9 21:10:04 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* tool/ifchange: fix timestamp error when target without * tool/ifchange: fix timestamp error when target without

8
ext/openssl/ossl_asn1.c
View File

@ -125,9 +125,13 @@ asn1integer_to_num(ASN1_INTEGER *ai)
if (!ai) { if (!ai) {
ossl_raise(rb_eTypeError, "ASN1_INTEGER is NULL!"); ossl_raise(rb_eTypeError, "ASN1_INTEGER is NULL!");
} }
if (!(bn = ASN1_INTEGER_to_BN(ai, NULL))) { if (ai->type == V_ASN1_ENUMERATED)
bn = ASN1_ENUMERATED_to_BN(ai, NULL);
else
bn = ASN1_INTEGER_to_BN(ai, NULL);
if (!bn)
ossl_raise(eOSSLError, NULL); ossl_raise(eOSSLError, NULL);
}
#if DO_IT_VIA_RUBY #if DO_IT_VIA_RUBY
if (!(txt = BN_bn2dec(bn))) { if (!(txt = BN_bn2dec(bn))) {
BN_free(bn); BN_free(bn);

6
test/openssl/test_asn1.rb
View File

@ -280,6 +280,12 @@ rEzBQ0F9dUyqQ9gyRg8KHhDfv9HzT1d/rnUZMkoombwYBRIUChGCYV0GnJcan2Zm
assert_equal 2 ** 31, OpenSSL::ASN1.decode(encoded).value.to_i assert_equal 2 ** 31, OpenSSL::ASN1.decode(encoded).value.to_i
end end
def test_decode_enumerated
encoded = OpenSSL::ASN1.Enumerated(0).to_der
assert_equal "\x0a\x01\x00".b, encoded
assert_equal encoded, OpenSSL::ASN1.decode(encoded).to_der
end
def test_create_inf_length_primitive def test_create_inf_length_primitive
expected = %w{ 24 80 04 01 61 00 00 } expected = %w{ 24 80 04 01 61 00 00 }
raw = [expected.join('')].pack('H*') raw = [expected.join('')].pack('H*')