diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/openssl/lib/net/telnets.rb | 2 | ||||
| -rw-r--r-- | lib/net/https.rb | 6 |
3 files changed, 7 insertions, 8 deletions
@@ -1,3 +1,10 @@ +Mon Dec 20 14:45:19 2004 GOTOU Yuuzou <gotoyuzo@notwork.org> + + * lib/net/https.rb: delete descriptions about key_file and cert_file. + fixed: [ruby-dev:25243] + + * ext/openssl/lib/net/telnets.rb: ditto. + Mon Dec 20 14:07:02 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/lib/multi-tk.rb: supports new features of Tcl/Tk8.5a2 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'] diff --git a/lib/net/https.rb b/lib/net/https.rb index a22084dc99..fb329df43d 100644 --- a/lib/net/https.rb +++ b/lib/net/https.rb @@ -67,16 +67,10 @@ It can be replaced by the following code: Sets an OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object. (This method is appeared in Michal Rokos's OpenSSL extention.) -: key_file, key_file=((|path|)) - Sets a private key file to use in PEM format. - : cert, cert=((|cert|)) Sets an OpenSSL::X509::Certificate object as client certificate (This method is appeared in Michal Rokos's OpenSSL extention). -: cert_file, cert_file=((|path|)) - Sets pathname of a X.509 certification file in PEM format. - : ca_file, ca_file=((|path|)) Sets path of a CA certification file in PEM format. The file can contrain several CA certificats. |