From 4634c34db318d157c1f741855dba9757cc8de1fd Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 28 Mar 2017 21:29:16 +0000 Subject: merge revision(s) 58200: [Backport #13376] * hash.c (any_hash): fix Symbol#hash to be nondeterministic. The patch was provided by Eric Wong. [ruby-core:80433] [Bug #13376] test/ruby/test_symbol.rb: new test for nondeterminism We need to ensure hashes for static symbols remain non-deterministic to avoid DoS attacks. This is currently the case since 2.4+, but was not for the 2.3 series. * test/ruby/test_symbol.rb (test_hash_nondeterministic): new test [ruby-core:80430] [Bug #13376] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'version.h') diff --git a/version.h b/version.h index 29116f98c8..709d03b0cb 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.3.4" -#define RUBY_RELEASE_DATE "2017-03-28" -#define RUBY_PATCHLEVEL 299 +#define RUBY_RELEASE_DATE "2017-03-29" +#define RUBY_PATCHLEVEL 300 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 28 +#define RUBY_RELEASE_DAY 29 #include "ruby/version.h" -- cgit v1.2.3 From 0ad168551355320c091045c0bb6d4b51798bbcc0 Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 29 Mar 2017 15:00:45 +0000 Subject: * hash.c (any_hash): fix CI failure on L32LLP64 architecture. The patch was provided by usa. [ruby-core:80484] [Bug #13376] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'version.h') diff --git a/version.h b/version.h index 709d03b0cb..17b906b43c 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.3.4" -#define RUBY_RELEASE_DATE "2017-03-29" -#define RUBY_PATCHLEVEL 300 +#define RUBY_RELEASE_DATE "2017-03-30" +#define RUBY_PATCHLEVEL 301 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 29 +#define RUBY_RELEASE_DAY 30 #include "ruby/version.h" -- cgit v1.2.3