Skip to content

Commit 9717fdc

Browse files
authored
Merge pull request #9633 from junaruga/wip/rubygems-start-ssl-server-remove-tmp_dh_callback
RubyGems: Remove unused ctx.tmp_dh_callback in start_ssl_server
2 parents c6d05b4 + c249eae commit 9717fdc

1 file changed

Lines changed: 0 additions & 15 deletions

File tree

test/rubygems/test_gem_remote_fetcher_local_ssl_server.rb

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,6 @@
1414
class TestGemRemoteFetcherLocalSSLServer < Gem::TestCase
1515
include Gem::DefaultUserInteraction
1616

17-
# Generated via:
18-
# x = OpenSSL::PKey::DH.new(2048) # wait a while...
19-
# x.to_s => pem
20-
TEST_KEY_DH2048 = OpenSSL::PKey::DH.new <<-_END_OF_PEM_
21-
-----BEGIN DH PARAMETERS-----
22-
MIIBCAKCAQEA3Ze2EHSfYkZLUn557torAmjBgPsqzbodaRaGZtgK1gEU+9nNJaFV
23-
G1JKhmGUiEDyIW7idsBpe4sX/Wqjnp48Lr8IeI/SlEzLdoGpf05iRYXC8Cm9o8aM
24-
cfmVgoSEAo9YLBpzoji2jHkO7Q5IPt4zxbTdlmmGFLc/GO9q7LGHhC+rcMcNTGsM
25-
49AnILNn49pq4Y72jSwdmvq4psHZwwFBbPwLdw6bLUDDCN90jfqvYt18muwUxDiN
26-
NP0fuvVAIB158VnQ0liHSwcl6+9vE1mL0Jo/qEXQxl0+UdKDjaGfTsn6HIrwTnmJ
27-
PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
28-
-----END DH PARAMETERS-----
29-
_END_OF_PEM_
30-
3117
def setup
3218
super
3319
@ssl_server_thread = nil
@@ -155,7 +141,6 @@ def start_ssl_server(config = {})
155141
ctx.cert = cert("ssl_cert.pem")
156142
ctx.key = key("ssl_key.pem")
157143
ctx.ca_file = File.join(__dir__, "ca_cert.pem")
158-
ctx.tmp_dh_callback = proc { TEST_KEY_DH2048 }
159144
ctx.verify_mode = config[:verify_mode] if config[:verify_mode]
160145
@ssl_server = OpenSSL::SSL::SSLServer.new(server, ctx)
161146
@ssl_server_thread = Thread.new do

0 commit comments

Comments
 (0)