[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  bff0f2badc4e692c50757b5632badcba5d94fa04 (commit)
      from  ed4fc85359d40bd06a53af9c8a058b8d3e4e3e39 (commit)


- Log -----------------------------------------------------------------
commit bff0f2badc4e692c50757b5632badcba5d94fa04
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 31 07:19:06 2018 +0200

    Ensure symbols don't get deprecated too early
    
    There are symbols we've marked for deprecation in OpenSSL 1.2.0.  We
    must ensure that they don't actually become deprecated before that.
    
    Fixes #6814
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/6824)

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

Summary of changes:
 include/openssl/opensslconf.h.in | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
index b793d48..bc98cad 100644
--- a/include/openssl/opensslconf.h.in
+++ b/include/openssl/opensslconf.h.in
@@ -9,6 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include <openssl/opensslv.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -97,7 +99,13 @@ extern "C" {
 # define OPENSSL_API_COMPAT OPENSSL_MIN_API
 #endif
 
-#if OPENSSL_API_COMPAT < 0x10200000L
+/*
+ * Do not deprecate things to be deprecated in version 1.2.0 before the
+ * OpenSSL version number matches.
+ */
+#if OPENSSL_VERSION_NUMBER < 0x10200000L
+# define DEPRECATEDIN_1_2_0(f)   f;
+#elif OPENSSL_API_COMPAT < 0x10200000L
 # define DEPRECATEDIN_1_2_0(f)   DECLARE_DEPRECATED(f)
 #else
 # define DEPRECATEDIN_1_2_0(f)