[前][次][番号順一覧][スレッド一覧]

ruby-changes:52921

From: usa <ko1@a...>
Date: Thu, 18 Oct 2018 00:34:11 +0900 (JST)
Subject: [ruby-changes:52921] usa:r65135 (ruby_2_3): * ext/openssl: backport changes from openssl 2.1.2.

usa	2018-10-18 00:34:06 +0900 (Thu, 18 Oct 2018)

  New Revision: 65135

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65135

  Log:
    * ext/openssl: backport changes from openssl 2.1.2.

  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/ext/openssl/ossl_x509name.c
    branches/ruby_2_3/test/openssl/test_x509name.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/ext/openssl/ossl_x509name.c
===================================================================
--- ruby_2_3/ext/openssl/ossl_x509name.c	(revision 65134)
+++ ruby_2_3/ext/openssl/ossl_x509name.c	(revision 65135)
@@ -339,7 +339,7 @@ ossl_x509name_cmp(VALUE self, VALUE othe https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/openssl/ossl_x509name.c#L339
 
     result = ossl_x509name_cmp0(self, other);
     if (result < 0) return INT2FIX(-1);
-    if (result > 1) return INT2FIX(1);
+    if (result > 0) return INT2FIX(1);
 
     return INT2FIX(0);
 }
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 65134)
+++ ruby_2_3/ChangeLog	(revision 65135)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Thu Oct 18 00:33:13 2018  Kazuki Yamaguchi <k@r...>
+
+	* ext/openssl: backport changes from openssl 2.1.2.
+
 Wed Mar 28 23:08:46 2018  NAKAMURA Usaku  <usa@r...>
 
 	get rid of test error/failure on Windows introduced at r62955
Index: ruby_2_3/test/openssl/test_x509name.rb
===================================================================
--- ruby_2_3/test/openssl/test_x509name.rb	(revision 65134)
+++ ruby_2_3/test/openssl/test_x509name.rb	(revision 65135)
@@ -338,10 +338,16 @@ class OpenSSL::TestX509Name < Test::Unit https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/openssl/test_x509name.rb#L338
   end
 
   def test_spaceship
-    n1 = OpenSSL::X509::Name.parse 'CN=a'
-    n2 = OpenSSL::X509::Name.parse 'CN=b'
+    n1 = OpenSSL::X509::Name.new([["CN", "a"]])
+    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
 
   def name_hash(name)
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 65134)
+++ ruby_2_3/version.h	(revision 65135)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
-#define RUBY_VERSION "2.3.7"
+#define RUBY_VERSION "2.3.8"
 #define RUBY_RELEASE_DATE "2018-10-18"
-#define RUBY_PATCHLEVEL 458
+#define RUBY_PATCHLEVEL 459
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 10

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]