[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Tue Apr 18 21:47:15 UTC 2017
The branch master has been updated
via edd689efbfa26a657a5d8310f43a4f11d29a460e (commit)
via 19eaee749d3b460246d9feadea350b22fa329f03 (commit)
from adcd8e37db682a5818415b1e0e1d8847dd9ab1e6 (commit)
- Log -----------------------------------------------------------------
commit edd689efbfa26a657a5d8310f43a4f11d29a460e
Author: Richard Levitte <levitte at openssl.org>
Date: Tue Apr 18 23:30:57 2017 +0200
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 at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3247)
commit 19eaee749d3b460246d9feadea350b22fa329f03
Author: Richard Levitte <levitte at openssl.org>
Date: Tue Apr 18 22:50:10 2017 +0200
VMS: Fix the passing of cflags for things not being installed
When building object files for libraries, information whether the
library would be installed or not wasn't passed down to the object
file building rules.
Also, make it so settings like |no_inst_lib_cflags| can be the empty
string.
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3247)
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 6 +++---
Configurations/common.tmpl | 2 +-
Configurations/descrip.mms.tmpl | 12 ++++++------
test/asn1_internal_test.c | 10 ++++++++++
test/chacha_internal_test.c | 10 ++++++++++
test/poly1305_internal_test.c | 11 +++++++++++
test/siphash_internal_test.c | 11 +++++++++++
test/tls13encryptiontest.c | 10 ++++++++++
test/tls13secretstest.c | 10 ++++++++++
test/uitest.c | 11 +----------
test/wpackettest.c | 11 +++++++++++
test/x509_internal_test.c | 9 +++++++++
12 files changed, 93 insertions(+), 20 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 09c0f2d..6a86b35 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1789,9 +1789,9 @@ sub vms_info {
debug => "/DEBUG/TRACEBACK",
release => "/NODEBUG/NOTRACEBACK"),
lib_cflags => add("/NAMES=(AS_IS,SHORTENED)/EXTERN_MODEL=STRICT_REFDEF"),
- # no_inst_bin_cflags is used instead of bin_cflags by descrip.mms.tmpl
- # for object files belonging to selected internal programs
- no_inst_bin_cflags => "/NAMES=(AS_IS,SHORTENED)",
+ # no_inst_lib_cflags is used instead of lib_cflags by descrip.mms.tmpl
+ # for object files belonging to selected internal libraries
+ no_inst_lib_cflags => "",
shared_target => "vms-shared",
dso_scheme => "vms",
thread_scheme => "pthreads",
diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl
index 5fd6b97..5e9cb36 100644
--- a/Configurations/common.tmpl
+++ b/Configurations/common.tmpl
@@ -133,7 +133,7 @@
objs => [ map { (my $x = $_) =~ s|\.o$||; $x }
@{$unified_info{sources}->{$lib}} ]);
foreach (@{$unified_info{sources}->{$lib}}) {
- doobj($_, $lib, intent => "lib");
+ doobj($_, $lib, intent => "lib", installed => is_installed($lib));
}
$cache{$lib} = 1;
}
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index b6eb94a..5b4b109 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -157,12 +157,12 @@ CFLAGS_Q=$(CFLAGS)
DEPFLAG= /DEFINE=({- join(",", @{$config{depdefines}}) -})
LDFLAGS= {- $target{lflags} -}
EX_LIBS= {- $target{ex_libs} ? ",".$target{ex_libs} : "" -}{- $config{ex_libs} ? ",".$config{ex_libs} : "" -}
-LIB_CFLAGS={- $target{lib_cflags} || "" -}
-DSO_CFLAGS={- $target{dso_cflags} || "" -}
-BIN_CFLAGS={- $target{bin_cflags} || "" -}
-NO_INST_LIB_CFLAGS={- $target{no_inst_lib_cflags} || '$(LIB_CFLAGS)' -}
-NO_INST_DSO_CFLAGS={- $target{no_inst_dso_cflags} || '$(DSO_CFLAGS)' -}
-NO_INST_BIN_CFLAGS={- $target{no_inst_bin_cflags} || '$(BIN_CFLAGS)' -}
+LIB_CFLAGS={- $target{lib_cflags} // "" -}
+DSO_CFLAGS={- $target{dso_cflags} // "" -}
+BIN_CFLAGS={- $target{bin_cflags} // "" -}
+NO_INST_LIB_CFLAGS={- $target{no_inst_lib_cflags} // '$(LIB_CFLAGS)' -}
+NO_INST_DSO_CFLAGS={- $target{no_inst_dso_cflags} // '$(DSO_CFLAGS)' -}
+NO_INST_BIN_CFLAGS={- $target{no_inst_bin_cflags} // '$(BIN_CFLAGS)' -}
PERL={- $config{perl} -}
diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index f936098..6dc8a11 100644
--- 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 0c0be9b..1c8d90a 100644
--- 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 03b0fa9..1ede874 100644
--- 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 fd097e0..2df7f39 100644
--- 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 8137847..c60d3b6 100644
--- 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 46ccd19..e74c486 100644
--- 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 0000505..574412d 100644
--- 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 2546ef3..a37fab7 100644
--- 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 d602efc..0a3a9be 100644
--- 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;
More information about the openssl-commits
mailing list