archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-21 11:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 35434:

Browse source 
* 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
This commit is contained in:
naruse 2012-05-19 05:42:26 +00:00
parent ca27aa831f
commit e050fc1bb7
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,7 +1,15 @@
Sat May 19 14:42:20 2012 Tanaka Akira <akr@fsij.org>
* 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 <akr@fsij.org> Sat May 19 14:41:45 2012 Tanaka Akira <akr@fsij.org>
* test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill. * 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 <akr@fsij.org> Sat May 19 14:41:09 2012 Tanaka Akira <akr@fsij.org>

2
lib/drb/ssl.rb
View file

@ -54,7 +54,7 @@ module DRb
return return
end end
rsa = OpenSSL::PKey::RSA.new(512){|p, n| rsa = OpenSSL::PKey::RSA.new(1024){|p, n|
next unless self[:verbose] next unless self[:verbose]
case p case p
when 0; $stderr.putc "." # BN_generate_prime when 0; $stderr.putc "." # BN_generate_prime

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 221 #define RUBY_PATCHLEVEL 222
#define RUBY_RELEASE_DATE "2012-05-19" #define RUBY_RELEASE_DATE "2012-05-19"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012