1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/openssl: backport changes from openssl 2.1.2.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@65135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-10-17 15:34:06 +00:00
parent b18c513e24
commit 556e9f726e
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Oct 18 00:33:13 2018 Kazuki Yamaguchi <k@rhe.jp>
* ext/openssl: backport changes from openssl 2.1.2.
Wed Mar 28 23:08:46 2018 NAKAMURA Usaku <usa@ruby-lang.org> Wed Mar 28 23:08:46 2018 NAKAMURA Usaku <usa@ruby-lang.org>
get rid of test error/failure on Windows introduced at r62955 get rid of test error/failure on Windows introduced at r62955

2
ext/openssl/ossl_x509name.c
View File

@ -339,7 +339,7 @@ ossl_x509name_cmp(VALUE self, VALUE other)
result = ossl_x509name_cmp0(self, other); result = ossl_x509name_cmp0(self, other);
if (result < 0) return INT2FIX(-1); if (result < 0) return INT2FIX(-1);
if (result > 1) return INT2FIX(1); if (result > 0) return INT2FIX(1);
return INT2FIX(0); return INT2FIX(0);
} }

12
test/openssl/test_x509name.rb
View File

@ -338,10 +338,16 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase
end end
def test_spaceship def test_spaceship
n1 = OpenSSL::X509::Name.parse 'CN=a' n1 = OpenSSL::X509::Name.new([["CN", "a"]])
n2 = OpenSSL::X509::Name.parse 'CN=b' n2 = OpenSSL::X509::Name.new([["CN", "a"]])
n3 = OpenSSL::X509::Name.new([["CN", "ab"]])
assert_equal(-1, n1 <=> n2) assert_equal 0, n1 <=> n2
assert_equal -1, n1 <=> n3
assert_equal 0, n2 <=> n1
assert_equal -1, n2 <=> n3
assert_equal 1, n3 <=> n1
assert_equal 1, n3 <=> n2
end end
def name_hash(name) def name_hash(name)

4
version.h
View File

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.7" #define RUBY_VERSION "2.3.8"
#define RUBY_RELEASE_DATE "2018-10-18" #define RUBY_RELEASE_DATE "2018-10-18"
#define RUBY_PATCHLEVEL 458 #define RUBY_PATCHLEVEL 459
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10