summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/webrick/ssl.rb4
-rw-r--r--version.h2
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b10579f25..2532616525 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 29 22:43:57 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/webrick/ssl.rb (WEBrick::Utils.create_self_signed_cert): wrongly
+ created dummy SSL certificate with version == 3 (no such version) and
+ serial == 0 (must be >0).
+
Sat Jul 24 15:44:29 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (fev_initialize): initialize pTypeInfo.
diff --git a/lib/webrick/ssl.rb b/lib/webrick/ssl.rb
index 03bfdf4aa0..1d7e610adc 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
diff --git a/version.h b/version.h
index 82d680f3c9..28f7417f16 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-11-22"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20101122
-#define RUBY_PATCHLEVEL 307
+#define RUBY_PATCHLEVEL 308
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8