Ruby/OpenSSL 2.0.5v2.0.5

3 files changed, 15 insertions, 2 deletions

diff --git a/History.md b/History.md
index bb499338..8baa0208 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,16 @@
+Version 2.0.5
+=============
+
+Bug fixes
+---------
+
+* Reading a PEM/DER-encoded private key or certificate from an IO object did
+  not work properly on mswin platforms.
+  [[ruby/openssl#128]](https://github.com/ruby/openssl/issues/128)
+* Broken length check in the PEM passphrase callback is fixed.
+* It failed to compile when OpenSSL is configured without TLS 1.0 support.
+
+
 Version 2.0.4
 =============
 
diff --git a/ext/openssl/ossl_version.h b/ext/openssl/ossl_version.h
index d5b9ac20..be3eebe1 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.4"
+#define OSSL_VERSION "2.0.5"
 
 #endif /* _OSSL_VERSION_H_ */
diff --git a/openssl.gemspec b/openssl.gemspec
index ef5fff54..1a305903 100644
--- a/openssl.gemspec
+++ b/openssl.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "openssl"
-  spec.version       = "2.0.4"
+  spec.version       = "2.0.5"
   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.}