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)

diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index 6dc8a1160d519ae26537ae9511f28cd6b9d98ff9..f936098cd9bc3432bbd95f2021db82b0ed016b4e 100644 (file)
--- 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 1c8d90a1afcd362bbe02f8d0134f3352ba714852..0c0be9b38792b552a07dabb9a60692c6784475f2 100644 (file)
--- 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 5ddd21c4d7414c056b385cdf2a5aa77a08decc44..98d44bd7f526bd264ce326cd52ff40ca62f8bc06 100644 (file)
--- 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 1ede8747a0c8c986f533b50fcb4bac5f18971c35..03b0fa91dfb2a04823687048746daaac5305c33e 100644 (file)
--- 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 2df7f3920ce089cadbbe93f4fed4c7e8dd49b8ee..fd097e0d5997a830301c0dd865c5238eaf4b522d 100644 (file)
--- 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"