aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-06-05 10:43:52 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-06-05 10:43:52 +0100
commit1f163fce818b02a0dab78d3fe91306eec434508b (patch)
treef2c897ec615ac0e335e57e5059c979974fc5f674
parent4bee980bb5d8f751a3a0500e6979983e40fd1bea (diff)
downloadopenssl-1f163fce818b02a0dab78d3fe91306eec434508b.tar.gz
Prepare for 1.0.0n-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 12566e5904..641b7b6fdb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
OpenSSL CHANGES
_______________
+ Changes between 1.0.0m and 1.0.0n [xx XXX xxxx]
+
+ *)
+
Changes between 1.0.0l and 1.0.0m [5 Jun 2014]
*) Fix for SSL/TLS MITM flaw. An attacker using a carefully crafted
diff --git a/NEWS b/NEWS
index 5a9afa35a8..fdcf142aad 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.0m and OpenSSL 1.0.0n [under development]
+
+ o
+
Major changes between OpenSSL 1.0.0l and OpenSSL 1.0.0m [5 Jun 2014]
o Fix for CVE-2014-0224
diff --git a/README b/README
index 9f3bae00de..c84fcec805 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.0.0m 5 Jun 2014
+ OpenSSL 1.0.0n-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 265a0054b4..18034fa73e 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 0x100000dfL
+#define OPENSSL_VERSION_NUMBER 0x100000e0L
#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0m-fips 5 Jun 2014"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0n-fips-dev xx XXX xxxx"
#else
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0m 5 Jun 2014"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0n-dev xx XXX xxxx"
#endif
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff --git a/openssl.spec b/openssl.spec
index d5e1e4a3a0..eac1a0f23a 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.0m
+Version: 1.0.0n
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries