VMS: Fix internals test programs

The internals test programs access header files that aren't guarded by
the public __DECC_INCLUDE_PROLOGUE.H and __DECC_INCLUDE_EPILOGUE.H files,
and therefore have no idea what the naming convention is.  Therefore, we
need to specify that explicitely in the internals test programs, since
they aren't built with the same naming convention as the library they
belong with.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3247)

diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index f936098cd9bc3432bbd95f2021db82b0ed016b4e..6dc8a1160d519ae26537ae9511f28cd6b9d98ff9 100644 (file)
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -59,7 +59,17 @@ 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 0c0be9b38792b552a07dabb9a60692c6784475f2..1c8d90a1afcd362bbe02f8d0134f3352ba714852 100644 (file)
--- a/test/chacha_internal_test.c
+++ b/test/chacha_internal_test.c
@@ -16,8 +16,18 @@
 #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/poly1305_internal_test.c b/test/poly1305_internal_test.c
index 03b0fa91dfb2a04823687048746daaac5305c33e..1ede8747a0c8c986f533b50fcb4bac5f18971c35 100644 (file)
--- a/test/poly1305_internal_test.c
+++ b/test/poly1305_internal_test.c
@@ -14,7 +14,18 @@
 
 #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 fd097e0d5997a830301c0dd865c5238eaf4b522d..2df7f3920ce089cadbbe93f4fed4c7e8dd49b8ee 100644 (file)
--- a/test/siphash_internal_test.c
+++ b/test/siphash_internal_test.c
@@ -15,7 +15,18 @@
 #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"
 

diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c
index 8137847d5a5d93e79874fa506e1f1eb78bb05705..c60d3b66fee4917f32b7c654f534560cd76c110f 100644 (file)
--- a/test/tls13encryptiontest.c
+++ b/test/tls13encryptiontest.c
@@ -9,9 +9,19 @@
 
 #include <openssl/ssl.h>
 #include <openssl/evp.h>
+
+#ifdef __VMS
+# pragma names save
+# pragma names as_is,shortened
+#endif
+
 #include "../ssl/ssl_locl.h"
 #include "../ssl/record/record_locl.h"
 
+#ifdef __VMS
+# pragma names restore
+#endif
+
 #include "testutil.h"
 #include "test_main.h"
 

diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c
index 46ccd1909ddc56a5146cb27108a6b8ee6e0d0ef2..e74c4861ed6bbcb130636e5a95ad0f072ba44613 100644 (file)
--- a/test/tls13secretstest.c
+++ b/test/tls13secretstest.c
@@ -9,8 +9,18 @@
 
 #include <openssl/ssl.h>
 #include <openssl/evp.h>
+
+#ifdef __VMS
+# pragma names save
+# pragma names as_is,shortened
+#endif
+
 #include "../ssl/ssl_locl.h"
 
+#ifdef __VMS
+# pragma names restore
+#endif
+
 #include "testutil.h"
 #include "test_main.h"
 

diff --git a/test/uitest.c b/test/uitest.c
index 0000505a916dbf90fe997cd5c613402910ce73d1..574412d633d06bb4f1cca2254787da35b7dee78c 100644 (file)
--- a/test/uitest.c
+++ b/test/uitest.c
@@ -13,23 +13,14 @@
 #include <openssl/err.h>
 
 /*
- * We know that on VMS, the [.apps] object files are compiled with uppercased
- * symbols.  We must therefore follow suit, or there will be linking errors.
- * Additionally, the VMS build does stdio via a socketpair.
+ * The VMS build does stdio via a socketpair.
  */
 #ifdef __VMS
-# pragma names save
-# pragma names uppercase, truncated
-
 # include "../apps/vms_term_sock.h"
 #endif
 
 #include "../apps/apps.h"
 
-#ifdef __VMS
-# pragma names restore
-#endif
-
 #include "testutil.h"
 #include "test_main_custom.h"
 

diff --git a/test/wpackettest.c b/test/wpackettest.c
index 2546ef3c6c3ab07e69f13a6ab3cfc9517df37887..a37fab7a3b6035069febedbfba51e90e390f015e 100644 (file)
--- a/test/wpackettest.c
+++ b/test/wpackettest.c
@@ -9,7 +9,18 @@
 
 #include <string.h>
 #include <openssl/buffer.h>
+
+#ifdef __VMS
+# pragma names save
+# pragma names as_is,shortened
+#endif
+
 #include "../ssl/packet_locl.h"
+
+#ifdef __VMS
+# pragma names restore
+#endif
+
 #include "testutil.h"
 #include "test_main_custom.h"
 

diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index d602efc57f50aeee5ed2383d59cdca3053a7d07f..0a3a9beacd1cf8c904e3e16ba38fbb6e73d8e641 100644 (file)
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -24,9 +24,18 @@
  *
  ***/
 
+#ifdef __VMS
+# pragma names save
+# pragma names as_is,shortened
+#endif
+
 #include "../crypto/x509v3/ext_dat.h"
 #include "../crypto/x509v3/standard_exts.h"
 
+#ifdef __VMS
+# pragma names restore
+#endif
+
 static int test_standard_exts()
 {
     size_t i;