diff --git a/ruby-2.6.0-use-larger-keys-for-SSL-drb-tests.patch b/ruby-2.6.0-use-larger-keys-for-SSL-drb-tests.patch new file mode 100644 index 0000000..1df2234 --- /dev/null +++ b/ruby-2.6.0-use-larger-keys-for-SSL-drb-tests.patch @@ -0,0 +1,38 @@ +From 8af6b87023cbb1ba6cebea7daaafa275e0dc687e Mon Sep 17 00:00:00 2001 +From: normal +Date: Mon, 3 Dec 2018 04:51:13 +0000 +Subject: [PATCH] drb: fix tests on Debian sid/unstable with OpenSSL 1.1.1a + +OpenSSL complains abour our keys being small and weak :< +Make them big and strong with 2048-bit RSA keys and SHA256 digests + +git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e +--- + lib/drb/ssl.rb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb +index 45fe4f1f74..8c2c1cc65d 100644 +--- a/lib/drb/ssl.rb ++++ b/lib/drb/ssl.rb +@@ -162,7 +162,7 @@ def setup_certificate + return + end + +- rsa = OpenSSL::PKey::RSA.new(1024){|p, n| ++ rsa = OpenSSL::PKey::RSA.new(2048){|p, n| + next unless self[:verbose] + case p + when 0; $stderr.putc "." # BN_generate_prime +@@ -196,7 +196,7 @@ def setup_certificate + if comment = self[:SSLCertComment] + cert.add_extension(ef.create_extension("nsComment", comment)) + end +- cert.sign(rsa, OpenSSL::Digest::SHA1.new) ++ cert.sign(rsa, OpenSSL::Digest::SHA256.new) + + @cert = cert + @pkey = rsa +-- +2.26.2 + diff --git a/ruby.spec b/ruby.spec index 5c5bbbe..8065bea 100644 --- a/ruby.spec +++ b/ruby.spec @@ -177,6 +177,9 @@ Patch44: ruby-2.6.4-open-uri-regenerate-server-certificates-for-tests.patch # Use larger keys for webrick test failures. # https://github.com/ruby/ruby/commit/a063f71a7ccc733d8ab4b997dfc3ffb1ab987afc Patch45: ruby-2.6.0-use-larger-keys-for-SSL-webrick-tests.patch +# Use larger keys for drb test failures. +# https://github.com/ruby/ruby/commit/fb0009cfdc203247f808f4dcd72c7baf272172ce +Patch46: ruby-2.6.0-use-larger-keys-for-SSL-drb-tests.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Suggests: rubypick @@ -573,6 +576,7 @@ rm -rf ext/fiddle/libffi* %patch43 -p1 %patch44 -p1 %patch45 -p1 +%patch46 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -1136,6 +1140,7 @@ MSPECOPTS="$MSPECOPTS -P 'File.lchmod raises a NotImplementedError when called'" - Use larger keys for test_ssl test failures. - Regenerate server certificates with larger keys for open-uri tests. - Use larger keys for webrick test failures. +- Use larger keys for drb test failures. * Tue Apr 30 2019 Jun Aruga - 2.5.5-105 - Update to Ruby 2.5.5.