ruby-changes:17384
From: yugui <ko1@a...>
Date: Sat, 2 Oct 2010 20:20:21 +0900 (JST)
Subject: [ruby-changes:17384] Ruby:r29389 (ruby_1_9_2): merges r29075 from trunk into ruby_1_9_2.
yugui 2010-10-02 20:20:01 +0900 (Sat, 02 Oct 2010) New Revision: 29389 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29389 Log: merges r29075 from trunk into ruby_1_9_2. -- * backport r29071 from ruby_1_8; * ext/openssl/ossl_asn1.c (obj_to_asn1bool): fixed ASN1::Boolean encoding issue for OpenSSL 1.0.0 compatibility. ASN1::Boolean.new(false).to_der wrongly generated "\1\1\377" which means 'true'. ASN1_TYPE_set of OpenSSL <= 0.9.8 treats value 0x100 as 'false' but OpenSSL >= 1.0.0 treats it as 'true'. ruby-ossl was using 0x100 for 'false' for backward compatibility. Just use 0x0 for the case OpenSSL >= OpenSSL 0.9.7. * test/openssl/test_asn1.rb: test added. Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/ext/openssl/ossl_asn1.c branches/ruby_1_9_2/test/openssl/test_asn1.rb branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 29388) +++ ruby_1_9_2/ChangeLog (revision 29389) @@ -1,3 +1,19 @@ +Mon Aug 23 13:09:27 2010 NAKAMURA, Hiroshi <nahi@r...> + + * backport r29071 from ruby_1_8; + + * ext/openssl/ossl_asn1.c (obj_to_asn1bool): fixed ASN1::Boolean + encoding issue for OpenSSL 1.0.0 compatibility. + ASN1::Boolean.new(false).to_der wrongly generated "\1\1\377" which + means 'true'. + + ASN1_TYPE_set of OpenSSL <= 0.9.8 treats value 0x100 as 'false' + but OpenSSL >= 1.0.0 treats it as 'true'. ruby-ossl was using + 0x100 for 'false' for backward compatibility. Just use 0x0 for + the case OpenSSL >= OpenSSL 0.9.7. + + * test/openssl/test_asn1.rb: test added. + Mon Aug 23 22:30:58 2010 Nobuyoshi Nakada <nobu@r...> * common.mk (version.o): depends on both of version.h and Index: ruby_1_9_2/ext/openssl/ossl_asn1.c =================================================================== --- ruby_1_9_2/ext/openssl/ossl_asn1.c (revision 29388) +++ ruby_1_9_2/ext/openssl/ossl_asn1.c (revision 29389) @@ -196,7 +196,11 @@ static ASN1_BOOLEAN obj_to_asn1bool(VALUE obj) { +#if OPENSSL_VERSION_NUMBER < 0x00907000L return RTEST(obj) ? 0xff : 0x100; +#else + return RTEST(obj) ? 0xff : 0x0; +#endif } static ASN1_INTEGER* Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 29388) +++ ruby_1_9_2/version.h (revision 29389) @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.2" #define RUBY_RELEASE_DATE "2010-10-02" -#define RUBY_PATCHLEVEL 9 +#define RUBY_PATCHLEVEL 10 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 Index: ruby_1_9_2/test/openssl/test_asn1.rb =================================================================== --- ruby_1_9_2/test/openssl/test_asn1.rb (revision 29388) +++ ruby_1_9_2/test/openssl/test_asn1.rb (revision 29389) @@ -194,4 +194,18 @@ cululated_sig = key.sign(OpenSSL::Digest::SHA1.new, tbs_cert.to_der) assert_equal(cululated_sig, sig_val.value) end + + def test_encode_boolean + encode_decode_test(OpenSSL::ASN1::Boolean, [true, false]) + end + + def test_encode_integer + encode_decode_test(OpenSSL::ASN1::Integer, [72, -127, -128, 128, -1, 0, 1, -(2**12345), 2**12345]) + end + + def encode_decode_test(type, values) + values.each do |v| + assert_equal(v, OpenSSL::ASN1.decode(type.new(v).to_der).value) + end + end end if defined?(OpenSSL) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/