[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  54ae378c9ea0a68fbdada833f6e2dd857bcecd65 (commit)
       via  0ee5fcde06827b041023e5a596d58da98e53740c (commit)
      from  d4c1763858c11bc3ed15250bb9612c718d80c62c (commit)


- Log -----------------------------------------------------------------
commit 54ae378c9ea0a68fbdada833f6e2dd857bcecd65
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jun 12 16:14:35 2015 +0100

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

commit 0ee5fcde06827b041023e5a596d58da98e53740c
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jun 12 16:10:40 2015 +0100

    Prepare for 1.0.2c 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 7cdebad..5aff3e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,11 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.2b and 1.0.2c [xx XXX xxxx]
+ Changes between 1.0.2c and 1.0.2d [xx XXX xxxx]
+
+  *)
+
+ Changes between 1.0.2b and 1.0.2c [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 5daeef7..f87f926 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.2b and OpenSSL 1.0.2c [under development]
+  Major changes between OpenSSL 1.0.2c and OpenSSL 1.0.2d [under development]
+
+      o
+
+  Major changes between OpenSSL 1.0.2b and OpenSSL 1.0.2c [12 Jun 2015]
 
       o Fix HMAC ABI incompatibility
 
diff --git a/README b/README
index 0bd70de..5f76493 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.2c-dev
+ OpenSSL 1.0.2d-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 d6df194..b33edf3 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  0x10002030L
+# define OPENSSL_VERSION_NUMBER  0x10002040L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2c-fips-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2d-fips-dev xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2c-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2d-dev xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/openssl.spec b/openssl.spec
index e6c7584..b721d65 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.2c
+Version: 1.0.2d
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries