summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/openssl/lib/net/https.rb6
-rw-r--r--ext/openssl/lib/net/protocols.rb3
-rw-r--r--ext/openssl/lib/net/telnets.rb2
4 files changed, 7 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a6ea96ba89..b02693f000e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/ext/openssl/lib/net/https.rb b/ext/openssl/lib/net/https.rb
index fb7f53c5556..9d24635f2fa 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 073d4f30274..6fb270304a9 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 c7ecbd717a1..a872f41e6ae 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']