[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Matt Caswell]

The branch OpenSSL_1_0_1-stable has been updated
       via  902795b2f19c8ed91aa13ad471526b0c3f5c674b (commit)
       via  2a8c2799e1227a020d60a32ff8d0a12544e35c50 (commit)
      from  2ad310ffde8c751586b6b5a8b93086fdf79eb815 (commit)


- Log -----------------------------------------------------------------
commit 902795b2f19c8ed91aa13ad471526b0c3f5c674b
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jun 12 16:24:26 2015 +0100

    Prepare for 1.0.1p-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 2a8c2799e1227a020d60a32ff8d0a12544e35c50
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jun 12 16:20:59 2015 +0100

    Prepare for 1.0.1o release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES           | 6 +++++-
 NEWS              | 6 +++++-
 README            | 2 +-
 crypto/opensslv.h | 6 +++---
 openssl.spec      | 2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3ad6093..af27f3f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,11 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.1n and 1.0.1o [xx XXX xxxx]
+ Changes between 1.0.1o and 1.0.1p [xx XXX xxxx]
+
+  *)
+
+ Changes between 1.0.1n and 1.0.1o [12 Jun 2015]
 
   *) Fix HMAC ABI incompatibility. The previous version introduced an ABI
      incompatibility in the handling of HMAC. The previous ABI has now been
diff --git a/NEWS b/NEWS
index 4452d22..1d81d4c 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,11 @@
   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.1n and OpenSSL 1.0.1o [under development]
+  Major changes between OpenSSL 1.0.1o and OpenSSL 1.0.1p [under development]
+
+      o
+
+  Major changes between OpenSSL 1.0.1n and OpenSSL 1.0.1o [12 Jun 2015]
 
       o Fix HMAC ABI incompatibility
 
diff --git a/README b/README
index d379b03..7b9ff6e 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.1o-dev
+ OpenSSL 1.0.1p-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 14bc8bd..f86e324 100644
--- 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)
  */
-# define OPENSSL_VERSION_NUMBER  0x100010f0L
+# define OPENSSL_VERSION_NUMBER  0x10001100L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1o-fips-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1p-fips-dev xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1o-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1p-dev xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/openssl.spec b/openssl.spec
index 3e8f3a9..67a6074 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.1o
+Version: 1.0.1p
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries