summaryrefslogtreecommitdiff
path: root/test/openssl
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2020-05-13 14:33:06 +0900
committerKazuki Yamaguchi <k@rhe.jp>2020-05-13 15:47:51 +0900
commitcc26638cae385a497a3e6b6ad667292819cda938 (patch)
tree3744fb50abf8eb2066a17178bdd6130f0c906cf3 /test/openssl
parent6f008c9d2fec52f2c2d39c04ad83e87c7975105c (diff)
[ruby/openssl] ssl: temporarily remove SSLContext#add_certificate_chain_file
Let's revert the changes for now, as it cannot be included in the 2.2.0 release. My comment on #257: > A blocker is OpenSSL::SSL::SSLContext#add_certificate_chain_file. It > has a pending change and I don't want to include it in an incomplete > state. > > The initial implementation in commit 46e4bdba40c5 was not really > useful. The issue is described in #305. #309 extended it > to take the corresponding private key together. However, the new > implementation was incompatible on Windows and was reverted by #320 to > the initial one. > > (The prerequisite to implement it in) an alternative way is #288, and > it's still cooking. This effectively reverts the following commits: - dacd08937ccd ("ssl: suppress test failure with SSLContext#add_certificate_chain_file", 2020-03-09) - 46e4bdba40c5 ("Add support for SSL_CTX_use_certificate_chain_file. Fixes #254.", 2019-06-13) https://github.com/ruby/openssl/commit/ea925619a9
Diffstat (limited to 'test/openssl')
-rw-r--r--test/openssl/test_ssl.rb28
1 files changed, 0 insertions, 28 deletions
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 4598927a17..6095d545b5 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -189,34 +189,6 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
end
end
- def test_add_certificate_chain_file
- # Create chain certificates file
- certs = Tempfile.open { |f| f << @svr_cert.to_pem << @ca_cert.to_pem; f }
- pkey = Tempfile.open { |f| f << @svr_key.to_pem; f }
-
- ctx_proc = -> ctx {
- # FIXME: This is a temporary test case written just to match the current
- # state. ctx.add_certificate_chain_file should take two arguments.
- ctx.add_certificate_chain_file(certs.path)
- # # Unset values set by start_server
- # ctx.cert = ctx.key = ctx.extra_chain_cert = nil
- # assert_nothing_raised { ctx.add_certificate_chain_file(certs.path, pkey.path) }
- }
-
- start_server(ctx_proc: ctx_proc) { |port|
- server_connect(port) { |ssl|
- assert_equal @svr_cert.subject, ssl.peer_cert.subject
- assert_equal [@svr_cert.subject, @ca_cert.subject],
- ssl.peer_cert_chain.map(&:subject)
-
- ssl.puts "abc"; assert_equal "abc\n", ssl.gets
- }
- }
- ensure
- certs&.unlink
- pkey&.unlink
- end
-
def test_sysread_and_syswrite
start_server { |port|
server_connect(port) { |ssl|