summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/webrick/ssl.rb4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 591c22abdc..04dc4f6cf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul 31 08:20:07 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/webrick/ssl.rb (WEBrick::Utils.create_self_signed_cert):
+ merged r28784 from ruby_1_8: wrongly created dummy SSL certificate
+ with version == 3 (no such version) and serial == 0 (must be >0).
+
Fri Jul 30 21:43:55 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (path_hash): Pathname#hash translated
diff --git a/lib/webrick/ssl.rb b/lib/webrick/ssl.rb
index ff73ad1b8b..b3cc7aaf01 100644
--- a/lib/webrick/ssl.rb
+++ b/lib/webrick/ssl.rb
@@ -50,8 +50,8 @@ module WEBrick
end
}
cert = OpenSSL::X509::Certificate.new
- cert.version = 3
- cert.serial = 0
+ cert.version = 2
+ cert.serial = 1
name = OpenSSL::X509::Name.new(cn)
cert.subject = name
cert.issuer = name