Prepare for 1.0.1q-dev

Reviewed-by: Stephen Henson <steve@openssl.org>

diff --git a/CHANGES b/CHANGES
index 2e888f7b0c282ef1a52435f1e0ba6817ba8053e3..38ae89fc45d7037a7a036b95d43bcc9ee17a8fbe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
  OpenSSL CHANGES
  _______________
 
  OpenSSL CHANGES
  _______________
 

+ Changes between 1.0.1p and 1.0.1q [xx XXX xxxx]
+
+  *)
+

  Changes between 1.0.1o and 1.0.1p [9 Jul 2015]
 
   *) Alternate chains certificate forgery
  Changes between 1.0.1o and 1.0.1p [9 Jul 2015]
 
   *) Alternate chains certificate forgery

diff --git a/NEWS b/NEWS
index 5e76d3fed42b0e8479b0169b1fc164943e680b09..ea0c71663ed2e3c6e0f22515bbbcb09bf3f5ccec 100644 (file)
--- 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.
 
   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.1p and OpenSSL 1.0.1q [under development]
+
+      o
+

   Major changes between OpenSSL 1.0.1o and OpenSSL 1.0.1p [9 Jul 2015]
 
       o Alternate chains certificate forgery (CVE-2015-1793)
   Major changes between OpenSSL 1.0.1o and OpenSSL 1.0.1p [9 Jul 2015]
 
       o Alternate chains certificate forgery (CVE-2015-1793)

diff --git a/README b/README
index bf03f30268121b699094a77079036aebbb1f827a..c3db93ae3df66fb5c8581c046a696b993fab1cff 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
 

- OpenSSL 1.0.1p 9 Jul 2015
+ OpenSSL 1.0.1q-dev

 
  Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
 
  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 bd66999c1c6b8020b9f795fcf02dd62b9a2f9bf7..78eef0365b93fc981faef9b3c363588cd8ce8e70 100644 (file)
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */

-# define OPENSSL_VERSION_NUMBER  0x1000110fL
+# define OPENSSL_VERSION_NUMBER  0x10001110L

 # ifdef OPENSSL_FIPS
 # ifdef OPENSSL_FIPS

-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1p-fips 9 Jul 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1q-fips-dev xx XXX xxxx"

 # else
 # else

-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1p 9 Jul 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1q-dev xx XXX xxxx"

 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 

diff --git a/openssl.spec b/openssl.spec
index 67a6074a8feea171b483f7613404a444cc573178..7ceb3224050fe66b35654aeeb8130c92074a8b4f 100644 (file)
--- 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}
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
 #Version: %{libmaj}.%{libmin}.%{librel}

-Version: 1.0.1p
+Version: 1.0.1q

 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries