From d15c1d10f63cee7ceb028a3762a4b8cc697427ef Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 16 Aug 2013 15:37:07 +0000 Subject: [PATCH] merge revision(s) 42429: [Backport #8750] * test/openssl/test_ssl.rb: Fix test for CVE-2013-4073. Patch by Antonio Terceiro. [Bug #8750] [ruby-core:56437] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/openssl/test_ssl.rb | 4 ++-- version.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fee2f9f332..6b23faf7b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 17 00:36:24 2013 Charlie Somerville + + * test/openssl/test_ssl.rb: Fix test for CVE-2013-4073. + Patch by Antonio Terceiro. [Bug #8750] [ruby-core:56437] + Sat Aug 17 00:32:17 2013 CHIKANAGA Tomoyuki * lib/rubygems: update to RubyGems 2.0.6. the patch by drbrain. diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index a3100a8c50..64efa8dd33 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -341,7 +341,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase [true, false].each do |criticality| cert = create_null_byte_SAN_certificate(criticality) assert_equal(false, OpenSSL::SSL.verify_certificate_identity(cert, 'www.example.com')) - assert_equal(true, OpenSSL::SSL.verify_certificate_identity(cert, 'www.example.com\0.evil.com')) + assert_equal(true, OpenSSL::SSL.verify_certificate_identity(cert, "www.example.com\0.evil.com")) assert_equal(false, OpenSSL::SSL.verify_certificate_identity(cert, '192.168.7.255')) assert_equal(true, OpenSSL::SSL.verify_certificate_identity(cert, '192.168.7.1')) assert_equal(false, OpenSSL::SSL.verify_certificate_identity(cert, '13::17')) @@ -358,7 +358,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase ext_asn1 = OpenSSL::ASN1.decode(ext.to_der) san_list_der = ext_asn1.value.reduce(nil) { |memo,val| val.tag == 4 ? val.value : memo } san_list_asn1 = OpenSSL::ASN1.decode(san_list_der) - san_list_asn1.value[0].value = 'www.example.com\0.evil.com' + san_list_asn1.value[0].value = "www.example.com\0.evil.com" pos = critical ? 2 : 1 ext_asn1.value[pos].value = san_list_asn1.to_der real_ext = OpenSSL::X509::Extension.new ext_asn1 diff --git a/version.h b/version.h index f0b5309d65..0bc38e57a6 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-08-17" -#define RUBY_PATCHLEVEL 292 +#define RUBY_PATCHLEVEL 293 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 8