diff options
author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-26 23:31:04 +0000 |
---|---|---|
committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-26 23:31:04 +0000 |
commit | 40761f59254bbdeca34e0bcedd906821d0384b54 (patch) | |
tree | 42bf0eee5639ba397c124a362ad792414e265149 | |
parent | 89eb20764ea4d3b780eee12488e7c3ff6fb9ba9f (diff) |
* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
treat wildcard character in commonName. [ruby-dev:28121]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9742 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/openssl/lib/openssl/ssl.rb | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Dec 27 08:29:18 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> + + * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech): + treat wildcard character in commonName. [ruby-dev:28121] + Mon Dec 26 22:32:47 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (rb_eval), gc.c (gc_mark_children), node.h (NEW_ALIAS, diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb index 9b287fc939..a535fc1715 100644 --- a/ext/openssl/lib/openssl/ssl.rb +++ b/ext/openssl/lib/openssl/ssl.rb @@ -82,8 +82,9 @@ module OpenSSL } if check_common_name cert.subject.to_a.each{|oid, value| - if oid == "CN" && value.casecmp(hostname) == 0 - return true + if oid == "CN" + reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+") + return true if /\A#{reg}\z/i =~ hostname end } end |