naruse	2017-03-12 16:52:32 +0900 (Sun, 12 Mar 2017)

  New Revision: 57899

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

  Log:
    merge revision(s) 57750:
    
    openssl: avoid segfault during running tests on Ubuntu trusty
    
    Import the commit 6693a549d673 ("test/test_pkey_ec: do not use dummy 0
    order", 2017-02-03) from upstream. Hopefully this will fix the segfault
    on RubyCI icc16-x64:
    
      http://rubyci.org/logs/rubyci.s3.amazonaws.com/icc-x64/ruby-trunk/log/20170301T050002Z.fail.html.gz

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/test/openssl/test_pkey_ec.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57898)
+++ ruby_2_4/version.h	(revision 57899)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-12"
-#define RUBY_PATCHLEVEL 56
+#define RUBY_PATCHLEVEL 57
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/test/openssl/test_pkey_ec.rb
===================================================================
--- ruby_2_4/test/openssl/test_pkey_ec.rb	(revision 57898)
+++ ruby_2_4/test/openssl/test_pkey_ec.rb	(revision 57899)
@@ -282,7 +282,7 @@ class OpenSSL::TestEC < OpenSSL::PKeyTes https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/openssl/test_pkey_ec.rb#L282
       group = OpenSSL::PKey::EC::Group.new(:GFp, 17, 2, 2)
       group.point_conversion_form = :uncompressed
       gen = OpenSSL::PKey::EC::Point.new(group, OpenSSL::BN.new("040501", 16))
-      group.set_generator(gen, 0, 0)
+      group.set_generator(gen, 19, 1)
 
       # 3 * (6, 3) = (16, 13)
       point_a = OpenSSL::PKey::EC::Point.new(group, OpenSSL::BN.new("040603", 16))

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57750


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