summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2014-10-15 13:52:37 +0100
committerMatt Caswell <matt@openssl.org>2014-10-15 13:52:37 +0100
commit13b2a4d06ae545ceef475e7e307c69be797f57b9 (patch)
treeffa3c0f36740f45f7e5b92ff3e71755e7351feae
parent41da9188cc1d7bb49831d2e27f7a5b8353d53024 (diff)
Prepare for 1.0.0p-dev
Reviewed-by: Stephen Henson <steve@openssl.org>
-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 60792cb06a..7c96384bc0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
OpenSSL CHANGES
_______________
+ Changes between 1.0.0o and 1.0.0p [xx XXX xxxx]
+
+ *)
+
Changes between 1.0.0n and 1.0.0o [15 Oct 2014]
*) Session Ticket Memory Leak.
diff --git a/NEWS b/NEWS
index bdad21ca13..84cef1a7e4 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.0o and OpenSSL 1.0.0p [under development]
+
+ o
+
Major changes between OpenSSL 1.0.0n and OpenSSL 1.0.0o [15 Oct 2014]
o Fix for CVE-2014-3513
diff --git a/README b/README
index 36d7aa17b8..8ee9bb115f 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.0.0o 15 Oct 2014
+ OpenSSL 1.0.0p-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 edad266c25..87a6a81be1 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 0x100000ffL
+#define OPENSSL_VERSION_NUMBER 0x10000100L
#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0o-fips 15 Oct 2014"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0p-fips-dev xx XXX xxxx"
#else
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0o 15 Oct 2014"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0p-dev xx XXX xxxx"
#endif
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff --git a/openssl.spec b/openssl.spec
index 42ce3e0a06..1804d2002e 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -6,7 +6,7 @@ Release: 1
Summary: Secure Sockets Layer and cryptography libraries and tools
Name: openssl
-Version: 1.0.0o
+Version: 1.0.0p
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries