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

Tue Nov 20 14:12:22 UTC 2018

The branch OpenSSL_1_0_2-stable has been updated
       via  49d07eb3cc85b5ea8877f7cdfadc8c20497eb09a (commit)
       via  5707219a6aae8052cb98aa361d115be01b8fd894 (commit)
       via  d98ff540df55b6ef4e29df9590e082afa7ad65b4 (commit)
      from  8ea167207d2a014bf592eb21b7e33ed2204d5063 (commit)


- Log -----------------------------------------------------------------
commit 49d07eb3cc85b5ea8877f7cdfadc8c20497eb09a
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 20 13:46:11 2018 +0000

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

commit 5707219a6aae8052cb98aa361d115be01b8fd894
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 20 13:45:20 2018 +0000

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

commit d98ff540df55b6ef4e29df9590e082afa7ad65b4
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 20 13:45:20 2018 +0000

    make update
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 CHANGES              | 6 +++++-
 NEWS                 | 6 +++++-
 README               | 2 +-
 crypto/Makefile      | 7 +++++++
 crypto/conf/Makefile | 7 ++++---
 crypto/opensslv.h    | 6 +++---
 crypto/rand/Makefile | 9 +++++----
 openssl.spec         | 2 +-
 util/libeay.num      | 1 +
 9 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index 11d7232..ab5cdf6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,11 @@
  https://github.com/openssl/openssl/commits/ and pick the appropriate
  release branch.
 
- Changes between 1.0.2p and 1.0.2q [xx XXX xxxx]
+ Changes between 1.0.2q and 1.0.2r [xx XXX xxxx]
+
+  *)
+
+ Changes between 1.0.2p and 1.0.2q [20 Nov 2018]
 
   *) Microarchitecture timing vulnerability in ECC scalar multiplication
 
diff --git a/NEWS b/NEWS
index 38fe668..566ce43 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.2p and OpenSSL 1.0.2q [under development]
+  Major changes between OpenSSL 1.0.2q and OpenSSL 1.0.2r [under development]
+
+      o
+
+  Major changes between OpenSSL 1.0.2p and OpenSSL 1.0.2q [20 Nov 2018]
 
       o Microarchitecture timing vulnerability in ECC scalar multiplication (CVE-2018-5407)
       o Timing vulnerability in DSA signature generation (CVE-2018-0734)
diff --git a/README b/README
index 3f5f81e..a288fd6 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.2q-dev
+ OpenSSL 1.0.2r-dev
 
  Copyright (c) 1998-2018 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/Makefile b/crypto/Makefile
index 72c96f6..180707e 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -180,6 +180,13 @@ ex_data.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
 ex_data.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
 ex_data.o: ex_data.c
 fips_ers.o: ../include/openssl/opensslconf.h fips_ers.c
+getenv.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
+getenv.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+getenv.o: ../include/openssl/err.h ../include/openssl/lhash.h
+getenv.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+getenv.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
+getenv.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
+getenv.o: getenv.c
 mem.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
 mem.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 mem.o: ../include/openssl/err.h ../include/openssl/lhash.h
diff --git a/crypto/conf/Makefile b/crypto/conf/Makefile
index d5f5c58..cd436f7 100644
--- a/crypto/conf/Makefile
+++ b/crypto/conf/Makefile
@@ -80,12 +80,13 @@ clean:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 conf_api.o: ../../e_os.h ../../include/openssl/bio.h
-conf_api.o: ../../include/openssl/conf.h ../../include/openssl/conf_api.h
-conf_api.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+conf_api.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
+conf_api.o: ../../include/openssl/conf_api.h ../../include/openssl/crypto.h
+conf_api.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 conf_api.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 conf_api.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 conf_api.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-conf_api.o: ../../include/openssl/symhacks.h conf_api.c
+conf_api.o: ../../include/openssl/symhacks.h ../cryptlib.h conf_api.c
 conf_def.o: ../../e_os.h ../../include/openssl/bio.h
 conf_def.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
 conf_def.o: ../../include/openssl/conf_api.h ../../include/openssl/crypto.h
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 8509228..f808f1e 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  0x10002110L
+# define OPENSSL_VERSION_NUMBER  0x10002120L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2q-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2r-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2q-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2r-dev  xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/crypto/rand/Makefile b/crypto/rand/Makefile
index df44369..1643a74 100644
--- a/crypto/rand/Makefile
+++ b/crypto/rand/Makefile
@@ -157,10 +157,11 @@ rand_win.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 rand_win.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 rand_win.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h
 rand_win.o: rand_win.c
-randfile.o: ../../e_os.h ../../include/openssl/buffer.h
-randfile.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-randfile.o: ../../include/openssl/opensslconf.h
+randfile.o: ../../e_os.h ../../include/openssl/bio.h
+randfile.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+randfile.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+randfile.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 randfile.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 randfile.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 randfile.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-randfile.o: randfile.c
+randfile.o: ../cryptlib.h randfile.c
diff --git a/openssl.spec b/openssl.spec
index f1061be..b42b739 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: 1.0.2q
+Version: 1.0.2r
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries
diff --git a/util/libeay.num b/util/libeay.num
index f5b4f21..2e52214 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4431,3 +4431,4 @@ EVP_PKEY_meth_get_decrypt               4785	EXIST::FUNCTION:
 EVP_PKEY_meth_get_cleanup               4786	EXIST::FUNCTION:
 EVP_PKEY_meth_get_encrypt               4787	EXIST::FUNCTION:
 EVP_PKEY_meth_get_copy                  4788	EXIST::FUNCTION:
+ossl_safe_getenv                        4789	EXIST::FUNCTION:
