Skip to content

Commit 8ac279d

Browse files
committed
(maint) Drop some ruby+openssl monkey patches
Ruby 2.5.0 bumped ruby/openssl from 2.0.5 to 2.1.0.beta1[1], which added the `OpenSSL::SSL::TLS1_VERSION` constant and is supported in jruby-openssl. Since puppet requires 2.5 or greater we can drop those patches. [1] ruby/ruby@609103d
1 parent 8b1a992 commit 8ac279d

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

lib/puppet/util/monkey_patches.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ def daemonize
3232
# (#19151) Reject all SSLv2 ciphers and handshakes
3333
require_relative '../../puppet/ssl/openssl_loader'
3434
unless Puppet::Util::Platform.jruby_fips?
35-
unless defined?(OpenSSL::SSL::TLS1_VERSION)
36-
module OpenSSL::SSL
37-
# see https://github.com/ruby/ruby/commit/609103dbb5fb182eec12f052226c43e39b907682#diff-09f822c26289f5347111795ca22ed7ed1cfadd6ebd28f987991d1d414eef565aR2755-R2759
38-
OpenSSL::SSL::TLS1_VERSION = 0x301
39-
end
40-
end
41-
4235
class OpenSSL::SSL::SSLContext
4336
if DEFAULT_PARAMS[:options]
4437
DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3

0 commit comments

Comments
 (0)