[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  40fa9d9ef7c05ea355067865c655653c663f03c8 (commit)
       via  932748fe2ee09c2974ccca82755d35aedb048035 (commit)
      from  ee669781d5de4c017595149c6036ca24b35aa2c7 (commit)


- Log -----------------------------------------------------------------
commit 40fa9d9ef7c05ea355067865c655653c663f03c8
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Tue Nov 5 11:43:52 2019 +0100

    add OPENSSL_FUNC.pod documenting OPENSSL_MSTR, OPENSSL_FUNC, and friends
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/10236)

commit 932748fe2ee09c2974ccca82755d35aedb048035
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Tue Oct 22 13:38:16 2019 +0200

    re-add definition of OPENSSL_MSTR deleted from opensslv.h in macros.h
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/10236)

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

Summary of changes:
 doc/man3/OPENSSL_FILE.pod | 56 +++++++++++++++++++++++++++++++++++++++++++++++
 include/openssl/macros.h  |  4 ++++
 util/other.syms           |  5 +++++
 3 files changed, 65 insertions(+)
 create mode 100644 doc/man3/OPENSSL_FILE.pod

diff --git a/doc/man3/OPENSSL_FILE.pod b/doc/man3/OPENSSL_FILE.pod
new file mode 100644
index 0000000000..9f18081b9e
--- /dev/null
+++ b/doc/man3/OPENSSL_FILE.pod
@@ -0,0 +1,56 @@
+=pod
+
+=head1 NAME
+
+OPENSSL_FILE, OPENSSL_LINE, OPENSSL_FUNC,
+OPENSSL_MSTR, OPENSSL_MSTR_HELPER
+- generic C programming utility macros
+
+=head1 SYNOPSIS
+
+ #include <openssl/macros.h>
+
+ #define OPENSSL_FILE /* typically: __FILE__ */
+ #define OPENSSL_LINE /* typically: __LINE__ */
+ #define OPENSSL_FUNC /* typically: __func__ */
+
+ #define OPENSSL_MSTR_HELPER(x) #x
+ #define OPENSSL_MSTR(x) OPENSSL_MSTR_HELPER(x)
+
+=head1 DESCRIPTION
+
+The macros B<OPENSSL_FILE> and B<OPENSSL_LINE>
+typically yield the current filename and line number during C compilation.
+When B<OPENSSL_NO_FILENAMES> is defined they yield B<""> and B<0>, respectively.
+
+The macro B<OPENSSL_FUNC> attempts to yield the name of the C function
+currently being compiled, as far as language and compiler versions allow.
+Otherwise, it yields "(unknown function)".
+
+The macro B<OPENSSL_MSTR> yields the expansion of the macro given as argument,
+which is useful for concatentation with string constants.
+The macro B<OPENSSL_MSTR_HELPER> is an auxiliary macro for this purpose.
+
+=head1 RETURN VALUES
+
+see above
+
+=head1 SEE ALSO
+
+L<crypto(7)>
+
+=head1 HISTORY
+
+B<OPENSSL_FUNC>, B<OPENSSL_MSTR>, and B<OPENSSL_MSTR_HELPER>
+were added in OpenSSL 3.0.
+
+=head1 COPYRIGHT
+
+Copyright 2018-2019 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the Apache License 2.0 (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+L<https://www.openssl.org/source/license.html>.
+
+=cut
diff --git a/include/openssl/macros.h b/include/openssl/macros.h
index 0c45580405..8548bde542 100644
--- a/include/openssl/macros.h
+++ b/include/openssl/macros.h
@@ -13,6 +13,10 @@
 #ifndef OPENSSL_MACROS_H
 # define OPENSSL_MACROS_H
 
+/* Helper macros for CPP string composition */
+# define OPENSSL_MSTR_HELPER(x) #x
+# define OPENSSL_MSTR(x) OPENSSL_MSTR_HELPER(x)
+
 /*
  * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers
  * don't like that.  This will hopefully silence them.
diff --git a/util/other.syms b/util/other.syms
index 8cb980ef8c..c5575ac151 100644
--- a/util/other.syms
+++ b/util/other.syms
@@ -300,6 +300,11 @@ EVP_rc5_32_12_16_cfb                    define
 EVP_seed_cfb                            define
 EVP_sm4_cfb                             define
 OBJ_cleanup                             define deprecated 1.1.0
+OPENSSL_FILE                            define
+OPENSSL_FUNC                            define
+OPENSSL_LINE                            define
+OPENSSL_MSTR                            define
+OPENSSL_MSTR_HELPER                     define
 OPENSSL_VERSION_MAJOR                   define
 OPENSSL_VERSION_MINOR                   define
 OPENSSL_VERSION_NUMBER                  define deprecated 3.0.0