aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-06 01:53:00 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-06 01:53:00 +0000
commit8233db65b6a8fc83848805d92bf3ce823e4b89a1 (patch)
treeee10df0f507fe90e130a1ff6151895c487d5745c
parent59f551635a6dfdb2ed5b84b275fdf8e4cdbf803f (diff)
downloadruby-8233db65b6a8fc83848805d92bf3ce823e4b89a1.tar.gz
* Fixed exception message for SSL post connection check failure. Patch
by Paul Betteridge. ref [Bug #3704] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/openssl/lib/openssl/ssl-internal.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 59aa118d28..ba69e644fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 6 10:46:55 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * Fixed exception message for SSL post connection check failure. Patch
+ by Paul Betteridge. ref [Bug #3704]
+
Mon Sep 6 10:31:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
* ext/readline/readline.c (readline_s_get_line_buffer):
diff --git a/ext/openssl/lib/openssl/ssl-internal.rb b/ext/openssl/lib/openssl/ssl-internal.rb
index 04a9faa0b6..c70b5b8f6b 100644
--- a/ext/openssl/lib/openssl/ssl-internal.rb
+++ b/ext/openssl/lib/openssl/ssl-internal.rb
@@ -118,7 +118,7 @@ module OpenSSL
def post_connection_check(hostname)
unless OpenSSL::SSL.verify_certificate_identity(peer_cert, hostname)
- raise SSLError, "hostname was not match with the server certificate"
+ raise SSLError, "hostname does not match the server certificate"
end
return true
end