ruby-changes:5373
From: shyouhei <ko1@a...>
Date: Sun, 8 Jun 2008 01:16:25 +0900 (JST)
Subject: [ruby-changes:5373] Ruby:r16876 (ruby_1_8_5): merge revision(s) 13657:
shyouhei 2008-06-08 01:15:19 +0900 (Sun, 08 Jun 2008)
New Revision: 16876
Modified files:
branches/ruby_1_8_5/ChangeLog
branches/ruby_1_8_5/ext/openssl/lib/net/ftptls.rb
branches/ruby_1_8_5/ext/openssl/lib/net/telnets.rb
branches/ruby_1_8_5/lib/net/http.rb
branches/ruby_1_8_5/lib/net/imap.rb
branches/ruby_1_8_5/lib/open-uri.rb
branches/ruby_1_8_5/version.h
Log:
merge revision(s) 13657:
* lib/net/http.rb, lib/open-uri.rb: remove
Net::HTTP#enable_post_connection_check. [ruby-dev:31960]
* lib/net/imap.rb: hostname should be verified against server's
indentity as persented in the server's certificate. [ruby-dev:31960]
* ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/openssl/lib/net/telnets.rb?r1=16876&r2=16875&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/open-uri.rb?r1=16876&r2=16875&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/net/imap.rb?r1=16876&r2=16875&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/net/http.rb?r1=16876&r2=16875&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16876&r2=16875&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/openssl/lib/net/ftptls.rb?r1=16876&r2=16875&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16876&r2=16875&diff_format=u
Index: ruby_1_8_5/ext/openssl/lib/net/telnets.rb
===================================================================
--- ruby_1_8_5/ext/openssl/lib/net/telnets.rb (revision 16875)
+++ ruby_1_8_5/ext/openssl/lib/net/telnets.rb (revision 16876)
@@ -134,6 +134,9 @@
@sock.verify_callback = @options['VerifyCallback']
@sock.verify_depth = @options['VerifyDepth']
@sock.connect
+ if @options['VerifyMode'] != OpenSSL::SSL::VERIFY_NONE
+ @sock.post_connection_check(@options['Host'])
+ end
@ssl = true
end
''
Index: ruby_1_8_5/ext/openssl/lib/net/ftptls.rb
===================================================================
--- ruby_1_8_5/ext/openssl/lib/net/ftptls.rb (revision 16875)
+++ ruby_1_8_5/ext/openssl/lib/net/ftptls.rb (revision 16876)
@@ -29,13 +29,23 @@
module Net
class FTPTLS < FTP
+ def connect(host, port=FTP_PORT)
+ @hostname = host
+ super
+ end
+
def login(user = "anonymous", passwd = nil, acct = nil)
+ store = OpenSSL::X509::Store.new
+ store.set_default_paths
ctx = OpenSSL::SSL::SSLContext.new('SSLv23')
+ ctx.cert_store = store
+ ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
ctx.key = nil
ctx.cert = nil
voidcmd("AUTH TLS")
@sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
@sock.connect
+ @sock.post_connection_check(@hostname)
super(user, passwd, acct)
voidcmd("PBSZ 0")
end
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog (revision 16875)
+++ ruby_1_8_5/ChangeLog (revision 16876)
@@ -1,3 +1,13 @@
+Sun Jun 8 00:56:44 2008 GOTOU Yuuzou <gotoyuzo@n...>
+
+ * lib/net/http.rb, lib/open-uri.rb: remove
+ Net::HTTP#enable_post_connection_check. [ruby-dev:31960]
+
+ * lib/net/imap.rb: hostname should be verified against server's
+ indentity as persented in the server's certificate. [ruby-dev:31960]
+
+ * ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto.
+
Thu Jun 5 16:19:27 2008 NAKAMURA Usaku <usa@r...>
* win32/win32.c (make_cmdvector): adjust escaped successive
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h (revision 16875)
+++ ruby_1_8_5/version.h (revision 16876)
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2008-06-05"
+#define RUBY_RELEASE_DATE "2008-06-08"
#define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20080605
-#define RUBY_PATCHLEVEL 129
+#define RUBY_RELEASE_CODE 20080608
+#define RUBY_PATCHLEVEL 130
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 8
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_5/lib/open-uri.rb
===================================================================
--- ruby_1_8_5/lib/open-uri.rb (revision 16875)
+++ ruby_1_8_5/lib/open-uri.rb (revision 16876)
@@ -229,7 +229,6 @@
if target.class == URI::HTTPS
require 'net/https'
http.use_ssl = true
- http.enable_post_connection_check = true
http.verify_mode = OpenSSL::SSL::VERIFY_PEER
store = OpenSSL::X509::Store.new
store.set_default_paths
Index: ruby_1_8_5/lib/net/http.rb
===================================================================
--- ruby_1_8_5/lib/net/http.rb (revision 16875)
+++ ruby_1_8_5/lib/net/http.rb (revision 16876)
@@ -470,7 +470,6 @@
@debug_output = nil
@use_ssl = false
@ssl_context = nil
- @enable_post_connection_check = false
end
def inspect
@@ -527,9 +526,6 @@
false # redefined in net/https
end
- # specify enabling SSL server certificate and hostname checking.
- attr_accessor :enable_post_connection_check
-
# Opens TCP connection and HTTP session.
#
# When this method is called with block, gives a HTTP object
@@ -589,12 +585,7 @@
end
s.connect
if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
- begin
- s.post_connection_check(@address)
- rescue OpenSSL::SSL::SSLError => ex
- raise ex if @enable_post_connection_check
- warn ex.message
- end
+ s.post_connection_check(@address)
end
end
on_connect
Index: ruby_1_8_5/lib/net/imap.rb
===================================================================
--- ruby_1_8_5/lib/net/imap.rb (revision 16875)
+++ ruby_1_8_5/lib/net/imap.rb (revision 16876)
@@ -900,6 +900,7 @@
end
@sock = SSLSocket.new(@sock, context)
@sock.connect # start ssl session.
+ @sock.post_connection_check(@host) if verify
else
@usessl = false
end
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/