Skip to content

Commit 8bf3852

Browse files
committed
Reduce OpenSSL monkey patch to only calling set_params
ruby-openssl has always merged the passed params with default params, so this is redundant. It's still a difference that the default SSLContext does not call set_params and expects the caller to do so. Link: https://github.com/ruby/openssl/blob/b814041f4fa2c64f0d2092c38bc2615a770f11c4/lib/openssl/ssl.rb#L113
1 parent 9c590f2 commit 8bf3852

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

lib/puppet/util/monkey_patches.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ class OpenSSL::SSL::SSLContext
5757

5858
def initialize(*args)
5959
__original_initialize(*args)
60-
params = {
61-
:options => DEFAULT_PARAMS[:options],
62-
:ciphers => DEFAULT_PARAMS[:ciphers],
63-
}
64-
set_params(params)
60+
set_params
6561
end
6662
end
6763
end

0 commit comments

Comments
 (0)