[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  27fc8ae22001a066ff99a8108f8dd70e547d6d64 (commit)
       via  f46f69f4092768ec4b911ced45c8cc73cc008739 (commit)
      from  424aa352458486d67e1e9cd3d3990dc06a60ba4a (commit)


- Log -----------------------------------------------------------------
commit 27fc8ae22001a066ff99a8108f8dd70e547d6d64
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Apr 20 11:16:40 2017 +0200

    VMS: remove name mangling guards around inclusion of internals
    
    Note that these guards are still needed around local header files that
    declare linkable symbols.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3259)

commit f46f69f4092768ec4b911ced45c8cc73cc008739
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Apr 20 10:14:03 2017 +0200

    VMS: Copy DECC inclusion epi- and prologues to internals
    
    Because many of our test programs use internal headers, we need to make
    sure they know how, exactly, to mangle the symbols.  So far, we've done
    so by specifying it in the affected test programs, but as things change,
    that will develop into a goose chase.  Better then to declare once and
    for all how symbols belonging in our libraries are meant to be treated,
    internally as well as publically.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3259)

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

Summary of changes:
 .../include/internal}/__DECC_INCLUDE_EPILOGUE.H               |  0
 .../include/internal}/__DECC_INCLUDE_PROLOGUE.H               |  0
 include/{openssl => internal}/__DECC_INCLUDE_EPILOGUE.H       |  0
 include/{openssl => internal}/__DECC_INCLUDE_PROLOGUE.H       |  0
 test/asn1_internal_test.c                                     | 10 ----------
 test/chacha_internal_test.c                                   | 10 ----------
 test/cipher_overhead_test.c                                   |  9 +++++++++
 test/poly1305_internal_test.c                                 | 11 -----------
 test/siphash_internal_test.c                                  | 11 -----------
 9 files changed, 9 insertions(+), 42 deletions(-)
 copy {include/openssl => crypto/include/internal}/__DECC_INCLUDE_EPILOGUE.H (100%)
 copy {include/openssl => crypto/include/internal}/__DECC_INCLUDE_PROLOGUE.H (100%)
 copy include/{openssl => internal}/__DECC_INCLUDE_EPILOGUE.H (100%)
 copy include/{openssl => internal}/__DECC_INCLUDE_PROLOGUE.H (100%)

diff --git a/include/openssl/__DECC_INCLUDE_EPILOGUE.H b/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H
similarity index 100%
copy from include/openssl/__DECC_INCLUDE_EPILOGUE.H
copy to crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H
diff --git a/include/openssl/__DECC_INCLUDE_PROLOGUE.H b/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H
similarity index 100%
copy from include/openssl/__DECC_INCLUDE_PROLOGUE.H
copy to crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H
diff --git a/include/openssl/__DECC_INCLUDE_EPILOGUE.H b/include/internal/__DECC_INCLUDE_EPILOGUE.H
similarity index 100%
copy from include/openssl/__DECC_INCLUDE_EPILOGUE.H
copy to include/internal/__DECC_INCLUDE_EPILOGUE.H
diff --git a/include/openssl/__DECC_INCLUDE_PROLOGUE.H b/include/internal/__DECC_INCLUDE_PROLOGUE.H
similarity index 100%
copy from include/openssl/__DECC_INCLUDE_PROLOGUE.H
copy to include/internal/__DECC_INCLUDE_PROLOGUE.H
diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index 6dc8a11..f936098 100644
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -59,17 +59,7 @@ static int test_tbl_standard()
  *
  ***/
 
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
 #include "internal/asn1_int.h"
-
-#ifdef __VMS
-# pragma names restore
-#endif
-
 #include "../crypto/asn1/standard_methods.h"
 
 static int test_standard_methods()
diff --git a/test/chacha_internal_test.c b/test/chacha_internal_test.c
index 1c8d90a..0c0be9b 100644
--- a/test/chacha_internal_test.c
+++ b/test/chacha_internal_test.c
@@ -16,18 +16,8 @@
 #include <openssl/opensslconf.h>
 #include "test_main.h"
 #include "testutil.h"
-
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
 #include "internal/chacha.h"
 
-#ifdef __VMS
-# pragma names restore
-#endif
-
 const static unsigned int key[] = {
     0x03020100, 0x07060504, 0x0b0a0908, 0x0f0e0d0c,
     0x13121110, 0x17161514, 0x1b1a1918, 0x1f1e1d1c
diff --git a/test/cipher_overhead_test.c b/test/cipher_overhead_test.c
index 5ddd21c..98d44bd 100644
--- a/test/cipher_overhead_test.c
+++ b/test/cipher_overhead_test.c
@@ -11,8 +11,17 @@
 #include "testutil.h"
 #include "test_main.h"
 
+#ifdef __VMS
+# pragma names save
+# pragma names as_is,shortened
+#endif
+
 #include "../ssl/ssl_locl.h"
 
+#ifdef __VMS
+# pragma names restore
+#endif
+
 static int cipher_overhead(void)
 {
     int ret = 1, i, n = ssl3_num_ciphers();
diff --git a/test/poly1305_internal_test.c b/test/poly1305_internal_test.c
index 1ede874..03b0fa9 100644
--- a/test/poly1305_internal_test.c
+++ b/test/poly1305_internal_test.c
@@ -14,18 +14,7 @@
 
 #include "testutil.h"
 #include "test_main_custom.h"
-
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
 #include "internal/poly1305.h"
-
-#ifdef __VMS
-# pragma names restore
-#endif
-
 #include "../crypto/poly1305/poly1305_local.h"
 #include "e_os.h"
 
diff --git a/test/siphash_internal_test.c b/test/siphash_internal_test.c
index 2df7f39..fd097e0 100644
--- a/test/siphash_internal_test.c
+++ b/test/siphash_internal_test.c
@@ -15,18 +15,7 @@
 #include <openssl/bio.h>
 #include "testutil.h"
 #include "test_main_custom.h"
-
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
 #include "internal/siphash.h"
-
-#ifdef __VMS
-# pragma names restore
-#endif
-
 #include "../crypto/siphash/siphash_local.h"
 #include "e_os.h"