From 922a7b24e85470d849d2bcd8f5a337c37127cfc8 Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Wed, 14 Jun 2017 17:58:54 +0900
Subject: History.md: wrap at 80 characters

---
 History.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'History.md')

diff --git a/History.md b/History.md
index 029426fb..11729df9 100644
--- a/History.md
+++ b/History.md
@@ -23,7 +23,8 @@ Supported platforms
 Notable changes
 ---------------
 
-* Add support for OpenSSL 1.1.0. [[Feature #12324]](https://bugs.ruby-lang.org/issues/12324)
+* Add support for OpenSSL 1.1.0.
+  [[Feature #12324]](https://bugs.ruby-lang.org/issues/12324)
 * Add support for LibreSSL
 
 * OpenSSL::Cipher
-- 
cgit v1.2.3


From f3088b512876292e3c0c4bd1e566ec259ba3371c Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Wed, 14 Jun 2017 18:16:00 +0900
Subject: History.md: add entries for 2.0.1-2.0.3

---
 History.md | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'History.md')

diff --git a/History.md b/History.md
index 11729df9..a215be87 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,38 @@
+Version 2.0.3
+=============
+
+Bug fixes
+---------
+
+* OpenSSL::ASN1::Constructive#each which was broken by 2.0.0 is fixed.
+  [[ruby/openssl#96]](https://github.com/ruby/openssl/pull/96)
+* Fixed build with static OpenSSL libraries on Windows.
+  [[Bug #13080]](https://bugs.ruby-lang.org/issues/13080)
+* OpenSSL::X509::Name#eql? which was broken by 2.0.0 is fixed.
+
+
+Version 2.0.2
+=============
+
+Bug fixes
+---------
+
+* Fix build with early 0.9.8 series which did not have SSL_CTX_clear_options().
+  [ruby-core:78693]
+
+
+Version 2.0.1
+=============
+
+Bug fixes
+---------
+
+* A GC issue around OpenSSL::BN is fixed.
+  [[ruby/openssl#87]](https://github.com/ruby/openssl/issues/87)
+* OpenSSL::ASN1 now parses BER encoding of GeneralizedTime without seconds.
+  [[ruby/openssl#88]](https://github.com/ruby/openssl/pull/88)
+
+
 Version 2.0.0
 =============
 
-- 
cgit v1.2.3


From dde512aa2d29bac496040af27c0d3487323b7552 Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Wed, 14 Jun 2017 18:19:19 +0900
Subject: Ruby/OpenSSL 2.0.4

---
 History.md                 | 12 ++++++++++++
 ext/openssl/ossl_version.h |  2 +-
 openssl.gemspec            |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'History.md')

diff --git a/History.md b/History.md
index a215be87..bb499338 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,15 @@
+Version 2.0.4
+=============
+
+Bug fixes
+---------
+
+* It now compiles with LibreSSL without renaming on Windows (mswin).
+* A workaround for the error queue leak of X509_load_cert_crl_file() that
+  causes random errors is added.
+  [[Bug #11033]](https://bugs.ruby-lang.org/issues/11033)
+
+
 Version 2.0.3
 =============
 
diff --git a/ext/openssl/ossl_version.h b/ext/openssl/ossl_version.h
index b98533f4..d5b9ac20 100644
--- a/ext/openssl/ossl_version.h
+++ b/ext/openssl/ossl_version.h
@@ -10,6 +10,6 @@
 #if !defined(_OSSL_VERSION_H_)
 #define _OSSL_VERSION_H_
 
-#define OSSL_VERSION "2.0.3"
+#define OSSL_VERSION "2.0.4"
 
 #endif /* _OSSL_VERSION_H_ */
diff --git a/openssl.gemspec b/openssl.gemspec
index da7a1765..e0080f2e 100644
--- a/openssl.gemspec
+++ b/openssl.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "openssl"
-  spec.version       = "2.0.3"
+  spec.version       = "2.0.4"
   spec.authors       = ["Martin Bosslet", "SHIBATA Hiroshi", "Zachary Scott", "Kazuki Yamaguchi"]
   spec.email         = ["ruby-core@ruby-lang.org"]
   spec.summary       = %q{OpenSSL provides SSL, TLS and general purpose cryptography.}
-- 
cgit v1.2.3