[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f33ca114c1f8a1ea07948fec6e175806d69274ef (commit)
      from  c50604eb4a6d52b120ea07bad50d3d82a70b26f7 (commit)


- Log -----------------------------------------------------------------
commit f33ca114c1f8a1ea07948fec6e175806d69274ef
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 24 14:56:26 2020 +0100

    VMS: mitigate for the C++ compiler that doesn't understand certain pragmas
    
    This only affects __DECC_INCLUDE_EPILOGUE.H and __DECC_INCLUDE_PROLOGUE.H,
    which are used automatically by HP and VSI C/C++ compilers.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/11159)
    
    (cherry picked from commit 605a0c709f4d50497a1c49ee117a0ec4bb956d58)

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

Summary of changes:
 CHANGES.md                                | 13 +++++++++++++
 include/openssl/__DECC_INCLUDE_EPILOGUE.H | 10 ++++++++--
 include/openssl/__DECC_INCLUDE_PROLOGUE.H | 12 +++++++++---
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c6d93ef3ed..84867ff29c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -935,6 +935,19 @@ OpenSSL 1.1.1
 
 ### Changes between 1.1.1d and 1.1.1e [xx XXX xxxx] ###
 
+ * *[VMS only]* The header files that the VMS compilers include automatically,
+   `__DECC_INCLUDE_PROLOGUE.H` and `__DECC_INCLUDE_EPILOGUE.H`, use pragmas
+   that the C++ compiler doesn't understand.  This is a shortcoming in the
+   compiler, but can be worked around with `__cplusplus` guards.
+
+   C++ applications that use OpenSSL libraries must be compiled using the
+   qualifier `/NAMES=(AS_IS,SHORTENED)` to be able to use all the OpenSSL
+   functions.  Otherwise, only functions with symbols of less than 31
+   characters can be used, as the linker will not be able to successfully
+   resolve symbols with longer names.
+
+   *Richard Levitte*
+
  * Added a new method to gather entropy on VMS, based on SYS$GET_ENTROPY.
    The presence of this system service is determined at run-time.
 
diff --git a/include/openssl/__DECC_INCLUDE_EPILOGUE.H b/include/openssl/__DECC_INCLUDE_EPILOGUE.H
index e57c0eab3e..b051919ebc 100644
--- a/include/openssl/__DECC_INCLUDE_EPILOGUE.H
+++ b/include/openssl/__DECC_INCLUDE_EPILOGUE.H
@@ -8,9 +8,15 @@
  */
 
 /*
- * This file is only used by HP C on VMS, and is included automatically
+ * This file is only used by HP C/C++ on VMS, and is included automatically
  * after each header file from this directory
  */
 
+/*
+ * The C++ compiler doesn't understand these pragmas, even though it
+ * understands the corresponding command line qualifier.
+ */
+#ifndef __cplusplus
 /* restore state.  Must correspond to the save in __decc_include_prologue.h */
-#pragma names restore
+# pragma names restore
+#endif
diff --git a/include/openssl/__DECC_INCLUDE_PROLOGUE.H b/include/openssl/__DECC_INCLUDE_PROLOGUE.H
index a013957557..d8f6dc4b85 100644
--- a/include/openssl/__DECC_INCLUDE_PROLOGUE.H
+++ b/include/openssl/__DECC_INCLUDE_PROLOGUE.H
@@ -8,13 +8,19 @@
  */
 
 /*
- * This file is only used by HP C on VMS, and is included automatically
+ * This file is only used by HP C/C++ on VMS, and is included automatically
  * after each header file from this directory
  */
 
+/*
+ * The C++ compiler doesn't understand these pragmas, even though it
+ * understands the corresponding command line qualifier.
+ */
+#ifndef __cplusplus
 /* save state */
-#pragma names save
+# pragma names save
 /* have the compiler shorten symbols larger than 31 chars to 23 chars
  * followed by a 8 hex char CRC
  */
-#pragma names as_is,shortened
+# pragma names as_is,shortened
+#endif