[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Fri Sep 14 09:00:46 UTC 2018
The branch master has been updated
via f09877c12c830d16f38064dace415679e867fc0f (commit)
via 2935f6241c3a1f0dc6c7a6e0a95da4bc5f35439b (commit)
via c40af30ec5b8ef30be870ad734fc8bf9caeeafc2 (commit)
from 34f5c8b1ff7b9a9a15f6a71c22fe83c2762b99d9 (commit)
- Log -----------------------------------------------------------------
commit f09877c12c830d16f38064dace415679e867fc0f
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Sep 13 17:08:04 2018 +0200
VMS libtestutil: look for lower case "main"
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7208)
commit 2935f6241c3a1f0dc6c7a6e0a95da4bc5f35439b
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Sep 13 17:02:53 2018 +0200
VMS: turn on name mangling for all our programs
With the change to have separate object files by intent, VMS name
mangling gets done differently. While we previously had that for
libraries only, we must now turn that on generally for our programs,
because some of them depend in internal libraries where mangled names
are all that there is.
Dynamic modules are still built with non-mangled names, which is good
enough to show that it's possible to build with our public libraries
using our public headers.
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7208)
commit c40af30ec5b8ef30be870ad734fc8bf9caeeafc2
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Sep 13 17:02:28 2018 +0200
VMS build: fix a misspelled 'bin_cflags' and a wrongly coded 'NO_INST_'
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7208)
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 11 ++++++++---
Configurations/descrip.mms.tmpl | 18 +++++++++++-------
test/build.info | 4 ++--
test/cipher_overhead_test.c | 10 ----------
test/curve448_internal_test.c | 11 -----------
test/ssl_cert_table_internal_test.c | 10 ----------
test/tls13encryptiontest.c | 11 -----------
test/tls13secretstest.c | 10 ----------
test/wpackettest.c | 11 -----------
test/x509_internal_test.c | 9 ---------
10 files changed, 21 insertions(+), 84 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 5cf345d..8360bb3 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1732,10 +1732,15 @@ my %targets = (
lflags => picker(default => "/MAP='F\$PARSE(\".MAP\",\"\$\@\")'",
debug => "/DEBUG/TRACEBACK",
release => "/NODEBUG/NOTRACEBACK"),
+ # Because of dso_cflags below, we can't set the generic |cflags| here,
+ # as it can't be overriden, so we set separate C flags for libraries
+ # and binaries instead.
+ bin_cflags => add("/NAMES=(AS_IS,SHORTENED)/EXTERN_MODEL=STRICT_REFDEF"),
lib_cflags => add("/NAMES=(AS_IS,SHORTENED)/EXTERN_MODEL=STRICT_REFDEF"),
- # 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 => "",
+ # For modules specifically, we assume that they only use public
+ # OpenSSL symbols, and therefore don't need to mangle names on
+ # their own.
+ dso_cflags => "",
ex_libs => add(sub { return vms_info()->{zlib} || (); }),
shared_target => "vms-shared",
dso_scheme => "vms",
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 95fa521..b1c00b7 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -298,8 +298,8 @@ BIN_CPPFLAGS={- join('', "'qual_includes'",
$target{bin_cppflags} || (),
@{$config{bin_cppflag}},
'$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -}
-BIN_CFLAGS={- join('', $target{bin_cflag} || (),
- @{$config{bin_cflag}},
+BIN_CFLAGS={- join('', $target{bin_cflags} || (),
+ @{$config{bin_cflags}},
'$(CNF_CFLAGS)', '$(CFLAGS)') -}
BIN_LDFLAGS={- join('', $target{bin_lflags} || (),
@{$config{bin_lflags}} || (),
@@ -312,12 +312,14 @@ NO_INST_LIB_CFLAGS={- join('', $target{no_inst_lib_cflags}
@{$config{lib_cflags}},
@{$config{shared_cflag}},
'$(CNF_CFLAGS)', '$(CFLAGS)') -}
-NO_INST_DSO_CFLAGS={- join('', $target{no_inst_lib_cflags}
- // $target{lib_cflags}
+NO_INST_DSO_CFLAGS={- join('', $target{no_inst_dso_cflags}
+ // $target{dso_cflags}
+ // (),
+ $target{no_inst_module_cflags}
+ // $target{module_cflags}
// (),
- $target{dso_cflags} || (),
- @{$config{lib_cflags}},
@{$config{dso_cflags}},
+ @{$config{module_cflags}},
'$(CNF_CFLAGS)', '$(CFLAGS)') -}
NO_INST_BIN_CFLAGS={- join('', $target{no_inst_bin_cflags}
// $target{bin_cflags}
@@ -1032,7 +1034,9 @@ EOF
"\@ WRITE OPT_FILE \"$x" } @objs).
"\"";
my $write_opt2 =
- join("\n\t", map { my @lines = ();
+ join("\n\t", map { my @lines = (
+ "\ WRITE OPT_FILE \"CASE_SENSITIVE=YES\""
+ );
my $x = $_ =~ /\[/ ? $_ : "[]".$_;
if ($x =~ m|\.EXE$|) {
push @lines, "\@ WRITE OPT_FILE \"$x/SHARE\"";
diff --git a/test/build.info b/test/build.info
index 08657c8..fa154f0 100644
--- a/test/build.info
+++ b/test/build.info
@@ -17,10 +17,10 @@ IF[{- !$disabled{tests} -}]
DEPEND[libtestutil.a]=../libcrypto
# Special hack for descrip.mms to include the MAIN object module
- # explicitly. This will only be done if there isn't a MAIN in the
+ # explicitly. This will only be done if there isn't a 'main' in the
# program's object modules already.
BEGINRAW[descrip.mms]
-INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
+INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=main
ENDRAW[descrip.mms]
PROGRAMS_NO_INST=\
diff --git a/test/cipher_overhead_test.c b/test/cipher_overhead_test.c
index f8c6fd7..8997fcc 100644
--- a/test/cipher_overhead_test.c
+++ b/test/cipher_overhead_test.c
@@ -9,18 +9,8 @@
#include "internal/nelem.h"
#include "testutil.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/curve448_internal_test.c b/test/curve448_internal_test.c
index e7d4378..f0f1079 100644
--- a/test/curve448_internal_test.c
+++ b/test/curve448_internal_test.c
@@ -10,18 +10,7 @@
#include <string.h>
#include <openssl/e_os2.h>
#include <openssl/evp.h>
-
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
#include "curve448_lcl.h"
-
-#ifdef __VMS
-# pragma names restore
-#endif
-
#include "testutil.h"
static unsigned int max = 1000;
diff --git a/test/ssl_cert_table_internal_test.c b/test/ssl_cert_table_internal_test.c
index 2104e8c..bba4e44 100644
--- a/test/ssl_cert_table_internal_test.c
+++ b/test/ssl_cert_table_internal_test.c
@@ -15,19 +15,9 @@
#include <openssl/ssl.h>
#include "testutil.h"
#include "internal/nelem.h"
-
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
#include "../ssl/ssl_locl.h"
#include "../ssl/ssl_cert_table.h"
-#ifdef __VMS
-# pragma names restore
-#endif
-
#define test_cert_table(nid, amask, idx) \
do_test_cert_table(nid, amask, idx, #idx)
diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c
index 6f359b3..f9f61a0 100644
--- a/test/tls13encryptiontest.c
+++ b/test/tls13encryptiontest.c
@@ -9,19 +9,8 @@
#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 "internal/nelem.h"
#include "testutil.h"
diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c
index 724c170..319df17 100644
--- a/test/tls13secretstest.c
+++ b/test/tls13secretstest.c
@@ -10,17 +10,7 @@
#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"
#define IVLEN 12
diff --git a/test/wpackettest.c b/test/wpackettest.c
index 773eef0..71eb763 100644
--- a/test/wpackettest.c
+++ b/test/wpackettest.c
@@ -9,18 +9,7 @@
#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"
static const unsigned char simple1[] = { 0xff };
diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index d2f41d7..12f6ac9 100644
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -23,18 +23,9 @@
*
***/
-#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(void)
{
size_t i;
More information about the openssl-commits
mailing list