diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-17 01:19:39 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-17 01:19:39 +0000 |
commit | ce8c46b48dc37fdcef0e5d677e7d6b52257a377b (patch) | |
tree | 210f6ef328dc6da91b7df9d1a406fd534c4fdfdf | |
parent | 347e8c440ad0ee0a219852685f77ba07feddce5c (diff) |
merge revision(s) 41805: [Backport #8575]
* lib/openssl/ssl.rb: Fix SSL client connection crash for SAN marked
critical.
The patch for CVE-2013-4073 caused SSL crash when a SSL server returns
the certificate that has critical SAN value. X509 extension could
include 2 or 3 elements in it:
[id, criticality, octet_string] if critical,
[id, octet_string] if not.
Making sure to pick the last element of X509 extension and use it as
SAN value.
[ruby-core:55685] [Bug #8575]
Thank you @nahi for providing the patch!
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@42016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 17 | ||||
-rw-r--r-- | ext/openssl/lib/openssl/ssl-internal.rb | 2 | ||||
-rw-r--r-- | test/openssl/test_ssl.rb | 27 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 36 insertions, 12 deletions
@@ -1,3 +1,20 @@ +Wed Jul 17 10:14:37 2013 Martin Bosslet <Martin.Bosslet@gmail.com> + + * lib/openssl/ssl-internal.rb: Fix SSL client connection crash for SAN + marked critical. + The patch for CVE-2013-4073 caused SSL crash when a SSL server returns + the certificate that has critical SAN value. X509 extension could + include 2 or 3 elements in it: + + [id, criticality, octet_string] if critical, + [id, octet_string] if not. + + Making sure to pick the last element of X509 extension and use it as + SAN value. + [ruby-core:55685] [Bug #8575] + + Thank you @nahi for providing the patch! + Wed Jul 17 09:59:33 2013 Tadayoshi Funaba <tadf@dotrb.org> * ext/date/date_core.c: fixed coding error [ruby-core:55337]. diff --git a/ext/openssl/lib/openssl/ssl-internal.rb b/ext/openssl/lib/openssl/ssl-internal.rb index 356d4e8bde..a2bb36c2cb 100644 --- a/ext/openssl/lib/openssl/ssl-internal.rb +++ b/ext/openssl/lib/openssl/ssl-internal.rb @@ -88,7 +88,7 @@ module OpenSSL should_verify_common_name = true cert.extensions.each{|ext| next if ext.oid != "subjectAltName" - id, ostr = OpenSSL::ASN1.decode(ext.to_der).value + ostr = OpenSSL::ASN1.decode(ext.to_der).value.last sequence = OpenSSL::ASN1.decode(ostr.value) sequence.value.each{|san| case san.tag diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 58493bf185..9239fdb479 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -352,25 +352,32 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase end def test_verify_certificate_identity - # creating NULL byte SAN certificate + [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(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')) + assert_equal(true, OpenSSL::SSL.verify_certificate_identity(cert, '13:0:0:0:0:0:0:17')) + end + end + + # Create NULL byte SAN certificate + def create_null_byte_SAN_certificate(critical = false) ef = OpenSSL::X509::ExtensionFactory.new cert = OpenSSL::X509::Certificate.new cert.subject = OpenSSL::X509::Name.parse "/DC=some/DC=site/CN=Some Site" - ext = ef.create_ext('subjectAltName', 'DNS:placeholder,IP:192.168.7.1,IP:13::17') + ext = ef.create_ext('subjectAltName', 'DNS:placeholder,IP:192.168.7.1,IP:13::17', critical) 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' - ext_asn1.value[1].value = san_list_asn1.to_der + pos = critical ? 2 : 1 + ext_asn1.value[pos].value = san_list_asn1.to_der real_ext = OpenSSL::X509::Extension.new ext_asn1 cert.add_extension(real_ext) - - 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(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')) - assert_equal(true, OpenSSL::SSL.verify_certificate_identity(cert, '13:0:0:0:0:0:0:17')) + cert end def test_tlsext_hostname @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 453 +#define RUBY_PATCHLEVEL 454 #define RUBY_RELEASE_DATE "2013-07-17" #define RUBY_RELEASE_YEAR 2013 |