kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): OpenSSL::ASN1.decode

Browse source 
should reject indefinite length primitive encodings as that is
          illegal. Patch by Martin Bosslet. See #4324.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nahi 2011-01-26 08:17:01 +00:00
parent 12893215b5
commit 0522ffd51f
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Jan 26 17:08:59 2011 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): OpenSSL::ASN1.decode
should reject indefinite length primitive encodings as that is
illegal. Patch by Martin Bosslet. See #4324.
Wed Jan 26 10:36:28 2011 NARUSE, Yui <naruse@ruby-lang.org> Wed Jan 26 10:36:28 2011 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (=~): documentation fix; the return value is nil when * string.c (=~): documentation fix; the return value is nil when

3
ext/openssl/ossl_asn1.c
View file

@ -772,6 +772,9 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
else value = ossl_asn1_decode0(&p, len, &off, depth+1, 0, yield); else value = ossl_asn1_decode0(&p, len, &off, depth+1, 0, yield);
} }
else{ else{
if ((j & 0x01) && (len == 0)) {
ossl_raise(eASN1Error, "Infinite length for primitive value");
}
value = rb_str_new((const char *)p, len); value = rb_str_new((const char *)p, len);
p += len; p += len;
off += len; off += len;

10
test/openssl/test_asn1.rb
View file

@ -430,4 +430,14 @@ class OpenSSL::TestASN1 < Test::Unit::TestCase
end end
end end
def test_primitive_inf_length
assert_raises(OpenSSL::ASN1::ASN1Error) do
spec = %w{ 02 80 02 01 01 00 00 }
raw = [spec.join('')].pack('H*')
OpenSSL::ASN1.decode(raw)
OpenSSL::ASN1.decode_all(raw)
end
end
end if defined?(OpenSSL) end if defined?(OpenSSL)