summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-04-07 17:58:39 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-04-07 17:58:39 +0100
commitebe221948dfea100d49cd4b1e38f4408021bd6f7 (patch)
tree4ba579f2a5a173e764f5baac910449be3ada71d6
parentb2d951e4232d2f90168f9a3dd0b7df9ecf2d81a8 (diff)
Prepare for 1.0.1h-dev
-rw-r--r--CHANGES4
-rw-r--r--NEWS4
-rw-r--r--README2
-rw-r--r--crypto/opensslv.h6
-rw-r--r--openssl.spec2
5 files changed, 13 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 4fcfd1d4be..b790cee98b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
OpenSSL CHANGES
_______________
+ Changes between 1.0.1g and 1.0.1h [xx XXX xxxx]
+
+ *)
+
Changes between 1.0.1f and 1.0.1g [7 Apr 2014]
*) A missing bounds check in the handling of the TLS heartbeat extension
diff --git a/NEWS b/NEWS
index ed486d146d..c23ac7b9ea 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@
This file gives a brief overview of the major changes between each OpenSSL
release. For more details please read the CHANGES file.
+ Major changes between OpenSSL 1.0.1g and OpenSSL 1.0.1h [under development]
+
+ o
+
Major changes between OpenSSL 1.0.1f and OpenSSL 1.0.1g [7 Apr 2014]
o Fix for CVE-2014-0160
diff --git a/README b/README
index 10b74d19d2..a9eaef931d 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.0.1g 7 Apr 2014
+ OpenSSL 1.0.1h-dev
Copyright (c) 1998-2011 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index ebe7180723..edde898683 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -25,11 +25,11 @@
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
-#define OPENSSL_VERSION_NUMBER 0x1000107fL
+#define OPENSSL_VERSION_NUMBER 0x10001080L
#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1g-fips 7 Apr 2014"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1h-fips-dev xx XXX xxxx"
#else
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1g 7 Apr 2014"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1h-dev xx XXX xxxx"
#endif
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff --git a/openssl.spec b/openssl.spec
index 44147ce64a..f0f5ea8bcd 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -7,7 +7,7 @@ Release: 1
Summary: Secure Sockets Layer and cryptography libraries and tools
Name: openssl
#Version: %{libmaj}.%{libmin}.%{librel}
-Version: 1.0.1g
+Version: 1.0.1h
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries