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_1_9_3@42622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 84589da815..7e987caed7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 19 18:34:31 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* test/openssl/test_ssl.rb: Fix test for CVE-2013-4073.
+	  Patch by Antonio Terceiro. [Bug #8750] [ruby-core:56437]
+
 Mon Aug 19 18:31:26 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* parse.y: fix build error with bison-3.0.
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 9239fdb479..2b92cf9701 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -355,7 +355,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'))
@@ -372,7 +372,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 e0de7ced3f..b79742675b 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 467
+#define RUBY_PATCHLEVEL 468
 
 #define RUBY_RELEASE_DATE "2013-08-19"
 #define RUBY_RELEASE_YEAR 2013