From f410afb35d1449d36f11990b1a4ddae8d833fbc8 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Mon, 26 Dec 2005 23:31:04 +0000 Subject: * 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/branches/ruby_1_8@9742 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/openssl/lib/openssl/ssl.rb | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50f6f61d2..8395e7fb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 27 08:29:18 2005 GOTOU Yuuzou + + * 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 * 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 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 -- cgit