mirror of
https://github.com/ruby/ruby.git
synced 2025-08-23 21:14:23 +02:00
* 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
This commit is contained in:
parent
870e8c03e4
commit
fd71f860a1
4 changed files with 7 additions and 10 deletions
|
@ -1,3 +1,9 @@
|
|||
Mon Dec 20 12:47:13 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
|
||||
|
||||
* ext/openssl/lib/net/https.rb,protocols.rb,telnets.rb: delete
|
||||
doc and code about SSLContext#{key_file,cert_file}.
|
||||
fixed: [ruby-dev:25243]
|
||||
|
||||
Mon Dec 20 12:42:17 2004 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* io.c (io_fwrite): workaround for MSVCRT's bug.
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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=)
|
||||
|
||||
|
|
|
@ -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']
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue