summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-08 14:23:38 +0000
committerMatt Caswell <matt@openssl.org>2015-01-08 14:23:38 +0000
commita98051fb47eed17baced30fa70e009f4c9608635 (patch)
treea30687e2fc6a89dd96b71598598438b50c8f3f02
parent225628f280d79dda31d135f96e231807d06e38c3 (diff)
Prepare for 1.0.0q-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 71f4a0127c..e52cb9e5a6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
OpenSSL CHANGES
_______________
+ Changes between 1.0.0p and 1.0.0q [xx XXX xxxx]
+
+ *)
+
Changes between 1.0.0o and 1.0.0p [8 Jan 2015]
*) Fix DTLS segmentation fault in dtls1_get_record. A carefully crafted DTLS
diff --git a/NEWS b/NEWS
index 210365038b..0a8846b4d9 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.0p and OpenSSL 1.0.0q [under development]
+
+ o
+
Major changes between OpenSSL 1.0.0o and OpenSSL 1.0.0p [8 Jan 2015]
o Fix for CVE-2014-3571
diff --git a/README b/README
index 3a855f31f4..9bc66595fd 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.0.0p 8 Jan 2015
+ OpenSSL 1.0.0q-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 fedbe1565e..b871e00a16 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 0x1000010fL
+#define OPENSSL_VERSION_NUMBER 0x10000110L
#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0p-fips 8 Jan 2015"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0q-fips-dev xx XXX xxxx"
#else
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0p 8 Jan 2015"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0q-dev xx XXX xxxx"
#endif
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff --git a/openssl.spec b/openssl.spec
index 1804d2002e..a6e807f0d5 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.0p
+Version: 1.0.0q
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries