From e050fc1bb7f397a84deadd68bdbbc405df8cca3a Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 19 May 2012 05:42:26 +0000 Subject: [PATCH] merge revision(s) 35434: * lib/drb/ssl.rb: generate 1024 bits RSA key instead of 512 bits. OpenSSL 1.0.1 rejects 512 bits RSA key for TLS1.2 with SHA512. http://rt.openssl.org/Ticket/Display.html?id=2769&user=guest&pass=guest reported by Bohuslav Kabrda. [ruby-core:43844] [ruby-trunk - Bug #6221] reported by NARUSE, Yui. [ruby-dev:45551] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 +++++++++- lib/drb/ssl.rb | 2 +- version.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19024f3c5b..5dcaa26bb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,15 @@ +Sat May 19 14:42:20 2012 Tanaka Akira + + * lib/drb/ssl.rb: generate 1024 bits RSA key instead of 512 bits. + OpenSSL 1.0.1 rejects 512 bits RSA key for TLS1.2 with SHA512. + http://rt.openssl.org/Ticket/Display.html?id=2769&user=guest&pass=guest + reported by Bohuslav Kabrda. + [ruby-core:43844] [ruby-trunk - Bug #6221] + Sat May 19 14:41:45 2012 Tanaka Akira * test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill. - [ruby-dev:45551] reported by NARUSE, Yui. + reported by NARUSE, Yui. [ruby-dev:45551] Sat May 19 14:41:09 2012 Tanaka Akira diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb index ebd648b256..2b6a2376ef 100644 --- a/lib/drb/ssl.rb +++ b/lib/drb/ssl.rb @@ -54,7 +54,7 @@ module DRb return end - rsa = OpenSSL::PKey::RSA.new(512){|p, n| + rsa = OpenSSL::PKey::RSA.new(1024){|p, n| next unless self[:verbose] case p when 0; $stderr.putc "." # BN_generate_prime diff --git a/version.h b/version.h index 1c2c12ca41..da3480a64e 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 221 +#define RUBY_PATCHLEVEL 222 #define RUBY_RELEASE_DATE "2012-05-19" #define RUBY_RELEASE_YEAR 2012