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)
This commit is contained in:
Richard Levitte 2017-04-18 23:30:57 +02:00
parent 19eaee749d
commit edd689efbf
9 changed files with 83 additions and 10 deletions

View File

@ -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()

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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;