summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authortenderlove <tenderlove@ruby-lang.org>2015-08-01 00:12:46 +0000
committertenderlove <tenderlove@ruby-lang.org>2015-08-01 00:12:46 +0000
commit21279aa4669da51ff86036ed8858cf0d27142ceb (patch)
tree1177efa9d2c8d9013e264e4dcae82667aa562d8b /lib
parent6018d69178bd9344c16a092f8bc5098997ddd058 (diff)
downloadruby-openssl-history-21279aa4669da51ff86036ed8858cf0d27142ceb.tar.gz
* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): Implement
SSLContext#options and options= using SSL_CTX_set_options and SSL_CTX_get_options. This reduces the number of ivars we need and simplifies `ossl_sslctx_setup`. * ext/openssl/lib/openssl/ssl.rb (module OpenSSL): Default `options` to SSL_OP_ALL git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/openssl/ssl.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/openssl/ssl.rb b/lib/openssl/ssl.rb
index 07f6931..d50f058 100644
--- a/lib/openssl/ssl.rb
+++ b/lib/openssl/ssl.rb
@@ -76,7 +76,7 @@ module OpenSSL
INIT_VARS = ["cert", "key", "client_ca", "ca_file", "ca_path",
"timeout", "verify_mode", "verify_depth", "renegotiation_cb",
- "verify_callback", "options", "cert_store", "extra_chain_cert",
+ "verify_callback", "cert_store", "extra_chain_cert",
"client_cert_cb", "session_id_context", "tmp_dh_callback",
"session_get_cb", "session_new_cb", "session_remove_cb",
"tmp_ecdh_callback", "servername_cb", "npn_protocols",
@@ -102,6 +102,7 @@ module OpenSSL
# You can get a list of valid methods with OpenSSL::SSL::SSLContext::METHODS
def initialize(version = nil)
INIT_VARS.each { |v| instance_variable_set v, nil }
+ self.options = OpenSSL::SSL::OP_ALL
return unless version
self.ssl_version = version
end