diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-26 23:26:21 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-26 23:26:21 +0000 |
| commit | 4eaeec635271ac3b9d416094b42e1a1573fa8ee9 (patch) | |
| tree | 1612c382aa8e11111f9a9865ce6ee5d8132f11a6 | |
| parent | 148d7428f3de8c63762eb6dc6652ab6e573544b9 (diff) | |
| download | ruby-4eaeec635271ac3b9d416094b42e1a1573fa8ee9.tar.gz ruby-4eaeec635271ac3b9d416094b42e1a1573fa8ee9.tar.xz ruby-4eaeec635271ac3b9d416094b42e1a1573fa8ee9.zip | |
* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
treat wildcard character in commonName. [ruby-dev:28121]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9741 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:22:15 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] + Wed Dec 21 16:47:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * file.c (w32_io_info): should return handle because FileIndex is diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb index 9b287fc93..a535fc171 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 |