From fd71f860a1f73a244964673003092424f670bea9 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Mon, 20 Dec 2004 03:49:16 +0000 Subject: * ext/openssl/lib/net/https.rb,protocols.rb,telnets.rb: delete doc and code about SSLContext#{key_file,cert_file}. fixed: [ruby-dev:25243] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/lib/net/https.rb | 6 ------ ext/openssl/lib/net/protocols.rb | 3 +-- ext/openssl/lib/net/telnets.rb | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) (limited to 'ext') diff --git a/ext/openssl/lib/net/https.rb b/ext/openssl/lib/net/https.rb index fb7f53c555..9d24635f2f 100644 --- a/ext/openssl/lib/net/https.rb +++ b/ext/openssl/lib/net/https.rb @@ -64,16 +64,10 @@ It can be replaced by follow one: Sets an OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object. (This method is appeared in Michal Rokos's OpenSSL extention.) -: key_file=((|path|)) - Sets a private key file to use in PEM format. - : cert=((|cert|)) Sets an OpenSSL::X509::Certificate object as client certificate. (This method is appeared in Michal Rokos's OpenSSL extention.) -: cert_file=((|path|)) - Sets pathname of a X.509 certification file in PEM format. - : ca_file=((|path|)) Sets path of a CA certification file in PEM format. The file can contrain several CA certificats. diff --git a/ext/openssl/lib/net/protocols.rb b/ext/openssl/lib/net/protocols.rb index 073d4f3027..6fb270304a 100644 --- a/ext/openssl/lib/net/protocols.rb +++ b/ext/openssl/lib/net/protocols.rb @@ -29,8 +29,7 @@ module Net extend Forwardable def_delegators(:@ssl_context, - :key=, :cert=, :key_file=, :cert_file=, - :ca_file=, :ca_path=, + :key=, :cert=, :ca_file=, :ca_path=, :verify_mode=, :verify_callback=, :verify_depth=, :timeout=, :cert_store=) diff --git a/ext/openssl/lib/net/telnets.rb b/ext/openssl/lib/net/telnets.rb index c7ecbd717a..a872f41e6a 100644 --- a/ext/openssl/lib/net/telnets.rb +++ b/ext/openssl/lib/net/telnets.rb @@ -124,9 +124,7 @@ module Net elsif SB[0] == $1[0] # respond to "IAC SB xxx IAC SE" if OPT_STARTTLS[0] == $1[1] && TLS_FOLLOWS[0] == $2[0] @sock = OpenSSL::SSL::SSLSocket.new(@sock) - @sock.cert_file = @options['CertFile'] @sock.cert = @options['Cert'] unless @sock.cert - @sock.key_file = @options['KeyFile'] @sock.key = @options['Key'] unless @sock.key @sock.ca_cert = @options['CACert'] @sock.ca_file = @options['CAFile'] -- cgit v1.2.3