summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-19 05:42:26 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-19 05:42:26 +0000
commite050fc1bb7f397a84deadd68bdbbc405df8cca3a (patch)
tree0073e44090aac34a7a93c1fefba4e70ef8df3d1a /lib
parentca27aa831f540dde4e9ce24ca1f0b43d6e39b2cb (diff)
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
Diffstat (limited to 'lib')
-rw-r--r--lib/drb/ssl.rb2
1 files changed, 1 insertions, 1 deletions
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