[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  1e3affbbcd85856c78e50c6bf56144bf9bc0eb23 (commit)
      from  e337b82410a031f0ff60ebf6744b97da2a276e51 (commit)


- Log -----------------------------------------------------------------
commit 1e3affbbcd85856c78e50c6bf56144bf9bc0eb23
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Nov 20 11:07:35 2020 +0100

    Remove the old DEPRECATEDIN macros
    
    They serve no purpose any more
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13461)

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

Summary of changes:
 include/openssl/macros.h    | 21 ---------------------
 util/perl/OpenSSL/ParseC.pm | 12 ------------
 2 files changed, 33 deletions(-)

diff --git a/include/openssl/macros.h b/include/openssl/macros.h
index 87cfde4920..d22bab91dc 100644
--- a/include/openssl/macros.h
+++ b/include/openssl/macros.h
@@ -179,99 +179,78 @@
 #  ifndef OPENSSL_NO_DEPRECATED
 #   define OSSL_DEPRECATEDIN_3_0                OSSL_DEPRECATED(3.0)
 #   define OSSL_DEPRECATEDIN_3_0_FOR(msg)       OSSL_DEPRECATED_FOR(3.0, msg)
-#   define DEPRECATEDIN_3_0(f)                  OSSL_DEPRECATEDIN_3_0 f;
 #  else
 #   define OPENSSL_NO_DEPRECATED_3_0
-#   define DEPRECATEDIN_3_0(f)
 #  endif
 # else
 #  define OSSL_DEPRECATEDIN_3_0
 #  define OSSL_DEPRECATEDIN_3_0_FOR(msg)
-#  define DEPRECATEDIN_3_0(f)                   f;
 # endif
 # if OPENSSL_API_LEVEL >= 10101
 #  ifndef OPENSSL_NO_DEPRECATED
 #   define OSSL_DEPRECATEDIN_1_1_1              OSSL_DEPRECATED(1.1.1)
 #   define OSSL_DEPRECATEDIN_1_1_1_FOR(msg)     OSSL_DEPRECATED_FOR(1.1.1, msg)
-#   define DEPRECATEDIN_1_1_1(f)                OSSL_DEPRECATEDIN_1_1_1 f;
 #  else
 #   define OPENSSL_NO_DEPRECATED_1_1_1
-#   define DEPRECATEDIN_1_1_1(f)
 #  endif
 # else
 #  define OSSL_DEPRECATEDIN_1_1_1
 #  define OSSL_DEPRECATEDIN_1_1_1_FOR(msg)
-#  define DEPRECATEDIN_1_1_1(f)                 f;
 # endif
 # if OPENSSL_API_LEVEL >= 10100
 #  ifndef OPENSSL_NO_DEPRECATED
 #   define OSSL_DEPRECATEDIN_1_1_0              OSSL_DEPRECATED(1.1.0)
 #   define OSSL_DEPRECATEDIN_1_1_0_FOR(msg)     OSSL_DEPRECATED_FOR(1.1.0, msg)
-#   define DEPRECATEDIN_1_1_0(f)                OSSL_DEPRECATEDIN_1_1_0 f;
 #  else
 #   define OPENSSL_NO_DEPRECATED_1_1_0
-#   define DEPRECATEDIN_1_1_0(f)
 #  endif
 # else
 #  define OSSL_DEPRECATEDIN_1_1_0
 #  define OSSL_DEPRECATEDIN_1_1_0_FOR(msg)
-#  define DEPRECATEDIN_1_1_0(f)                 f;
 # endif
 # if OPENSSL_API_LEVEL >= 10002
 #  ifndef OPENSSL_NO_DEPRECATED
 #   define OSSL_DEPRECATEDIN_1_0_2              OSSL_DEPRECATED(1.0.2)
 #   define OSSL_DEPRECATEDIN_1_0_2_FOR(msg)     OSSL_DEPRECATED_FOR(1.0.2, msg)
-#   define DEPRECATEDIN_1_0_2(f)                OSSL_DEPRECATEDIN_1_0_2 f;
 #  else
 #   define OPENSSL_NO_DEPRECATED_1_0_2
-#   define DEPRECATEDIN_1_0_2(f)
 #  endif
 # else
 #  define OSSL_DEPRECATEDIN_1_0_2
 #  define OSSL_DEPRECATEDIN_1_0_2_FOR(msg)
-#  define DEPRECATEDIN_1_0_2(f)                 f;
 # endif
 # if OPENSSL_API_LEVEL >= 10001
 #  ifndef OPENSSL_NO_DEPRECATED
 #   define OSSL_DEPRECATEDIN_1_0_1              OSSL_DEPRECATED(1.0.1)
 #   define OSSL_DEPRECATEDIN_1_0_1_FOR(msg)     OSSL_DEPRECATED_FOR(1.0.1, msg)
-#   define DEPRECATEDIN_1_0_1(f)                OSSL_DEPRECATEDIN_1_0_1 f;
 #  else
 #   define OPENSSL_NO_DEPRECATED_1_0_1
-#   define DEPRECATEDIN_1_0_1(f)
 #  endif
 # else
 #  define OSSL_DEPRECATEDIN_1_0_1
 #  define OSSL_DEPRECATEDIN_1_0_1_FOR(msg)
-#  define DEPRECATEDIN_1_0_1(f)                 f;
 # endif
 # if OPENSSL_API_LEVEL >= 10000
 #  ifndef OPENSSL_NO_DEPRECATED
 #   define OSSL_DEPRECATEDIN_1_0_0              OSSL_DEPRECATED(1.0.0)
 #   define OSSL_DEPRECATEDIN_1_0_0_FOR(msg)     OSSL_DEPRECATED_FOR(1.0.0, msg)
-#   define DEPRECATEDIN_1_0_0(f)                OSSL_DEPRECATEDIN_1_0_0 f;
 #  else
 #   define OPENSSL_NO_DEPRECATED_1_0_0
-#   define DEPRECATEDIN_1_0_0(f)
 #  endif
 # else
 #  define OSSL_DEPRECATEDIN_1_0_0
 #  define OSSL_DEPRECATEDIN_1_0_0_FOR(msg)
-#  define DEPRECATEDIN_1_0_0(f)                 f;
 # endif
 # if OPENSSL_API_LEVEL >= 908
 #  ifndef OPENSSL_NO_DEPRECATED
 #   define OSSL_DEPRECATEDIN_0_9_8              OSSL_DEPRECATED(0.9.8)
 #   define OSSL_DEPRECATEDIN_0_9_8_FOR(msg)     OSSL_DEPRECATED_FOR(0.9.8, msg)
-#   define DEPRECATEDIN_0_9_8(f)                OSSL_DEPRECATEDIN_0_9_8 f;
 #  else
 #   define OPENSSL_NO_DEPRECATED_0_9_8
-#   define DEPRECATEDIN_0_9_8(f)
 #  endif
 # else
 #  define OSSL_DEPRECATEDIN_0_9_8
 #  define OSSL_DEPRECATEDIN_0_9_8_FOR(msg)
-#  define DEPRECATEDIN_0_9_8(f)                 f;
 # endif
 
 /*
diff --git a/util/perl/OpenSSL/ParseC.pm b/util/perl/OpenSSL/ParseC.pm
index f4e5783e98..0abb469d9a 100644
--- a/util/perl/OpenSSL/ParseC.pm
+++ b/util/perl/OpenSSL/ParseC.pm
@@ -261,18 +261,6 @@ my @opensslchandlers = (
     #####
     # Deprecated stuff, by OpenSSL release.
 
-    # We trick the parser by pretending that the declaration is wrapped in a
-    # check if the OPENSSL_NO_DEPRECATEDIN_x_y[_z] macro is defined or not.
-    # Callers of parse() will have to decide what to do with it.
-    { regexp   => qr/(DEPRECATEDIN_\d+_\d+(?:_\d+)?)<<<\((.*)\)>>>/,
-      massager => sub { return (<<"EOF");
-#ifndef OPENSSL_NO_$1
-$2;
-#endif
-EOF
-      },
-    },
-
     # OSSL_DEPRECATEDIN_x_y[_z] is simply ignored.  Such declarations are
     # supposed to be guarded with an '#ifdef OPENSSL_NO_DEPRECATED_x_y[_z]'
     { regexp   => qr/OSSL_DEPRECATEDIN_\d+_\d+(?:_\d+)?\s+(.*)/,