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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3259)

5 files changed, 9 insertions, 42 deletions

diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index 6dc8a1160d..f936098cd9 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 1c8d90a1af..0c0be9b387 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 5ddd21c4d7..98d44bd7f5 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 1ede8747a0..03b0fa91df 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 2df7f3920c..fd097e0d59 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"