aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-07 13:37:18 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-07 13:37:18 +0000
commit2e3b4e0b32b91c79922c75d3aa3566c6d27f9153 (patch)
treeae79c085810ec9bc78c549acfb02c7f1536f5a3d /lib
parent21413c79bdb1aef1928f2fc62becac593ae83417 (diff)
downloadruby-2e3b4e0b32b91c79922c75d3aa3566c6d27f9153.tar.gz
* lib/webrick/ssl.rb: Accept string value for SSLCertName. It is used
to invoke ssl server with command line. [fix GH-1329] Patch by @kerlin * test/webrick/test_ssl_server.rb: Added test for GH-1329 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/webrick/ssl.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/webrick/ssl.rb b/lib/webrick/ssl.rb
index b072546948..d626e149ec 100644
--- a/lib/webrick/ssl.rb
+++ b/lib/webrick/ssl.rb
@@ -108,7 +108,8 @@ module WEBrick
cert = OpenSSL::X509::Certificate.new
cert.version = 2
cert.serial = 1
- name = OpenSSL::X509::Name.new(cn)
+ name = (cn.kind_of? String) ? OpenSSL::X509::Name.parse(cn)
+ : OpenSSL::X509::Name.new(cn)
cert.subject = name
cert.issuer = name
cert.not_before = Time.now