[openssl-commits] [openssl] master update
Matt Caswell
matt at openssl.org
Thu Apr 14 15:42:51 UTC 2016
The branch master has been updated
via f2ead992c945f13b59058fb3ce56c0227478ec30 (commit)
via df6533795b1f9b4cad8dd2773137873355c4b4cc (commit)
via d90a6beb0e8b519e345204cc533597a2e563dab5 (commit)
from c3a64b52788df139d649efaaf993c27dc89ba6ce (commit)
- Log -----------------------------------------------------------------
commit f2ead992c945f13b59058fb3ce56c0227478ec30
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Apr 14 16:07:37 2016 +0100
Fix installation on VMS for no-stdio and no-autoalginit
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Matt Caswell <matt at openssl.org>
commit df6533795b1f9b4cad8dd2773137873355c4b4cc
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Apr 14 16:04:56 2016 +0100
Fix installation for no-stdio and no-autoalginit
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Matt Caswell <matt at openssl.org>
commit d90a6beb0e8b519e345204cc533597a2e563dab5
Author: Matt Caswell <matt at openssl.org>
Date: Thu Apr 14 13:44:15 2016 +0100
Fix no-stdio and no-autoalginit
no-stdio does not work with the apps. Since the tests also need the apps
it doesn't support that either. Therefore we disable building of both.
no-autoalginit is not compatible with the apps because it requires explicit
loading of the algorithms, and the apps don't do that. Therefore we disable
building the apps for this option. Similarly the tests depend on the apps
so we also disable the tests. Finally the whole point about no-autoalginit
is to avoid excessive executable sizes when doing static linking. Therefore
we disable "shared" if this option is selected.
Reviewed-by: Richard Levitte <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 6 +
Configurations/unix-Makefile.tmpl | 6 +
Configurations/windows-makefile.tmpl | 4 +
Configure | 6 +
apps/build.info | 36 +--
test/build.info | 414 ++++++++++++++++++-----------------
tools/build.info | 6 +-
7 files changed, 253 insertions(+), 225 deletions(-)
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 85e1cd9..2e58b1a 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -226,6 +226,7 @@ build_tests_nodep : $(TESTPROGS)
test tests : configdata.pm, -
build_apps_nodep, build_engines_nodep, build_tests_nodep, -
depend
+ @ ! {- output_off() if $disabled{tests}; "" -}
SET DEFAULT [.test]{- move("test") -}
DEFINE SRCTOP {- sourcedir() -}
DEFINE BLDTOP {- builddir() -}
@@ -235,6 +236,9 @@ test tests : configdata.pm, -
DEASSIGN BLDTOP
DEASSIGN SRCTOP
SET DEFAULT [-]{- move("..") -}
+ @ ! {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
+ @ WRITE SYS$OUTPUT "Tests are not supported with your chosen Configure options"
+ @ ! {- output_on() if !$disabled{tests}; "" -}
list-tests :
@ TOP=$(SRCDIR) PERL=$(PERL) $(PERL) {- catfile($config{sourcedir},"test", "run_tests.pl") -} list
@@ -328,6 +332,7 @@ install_dev : check_INSTALLTOP
@ {- output_on() if $disabled{shared}; "" -} !
install_runtime : check_INSTALLTOP
+ @ ! {- output_off() if $disabled{apps}; "" -}
@ WRITE SYS$OUTPUT "*** Installing runtime files"
@ ! Install the main program
- CREATE/DIR ossl_installroot:[EXE.'arch']
@@ -336,6 +341,7 @@ install_runtime : check_INSTALLTOP
- CREATE/DIR ossl_installroot:[EXE]
COPY/PROT=W:RE [.APPS]CA.pl ossl_installroot:[EXE]
COPY/PROT=W:RE [.TOOLS]c_rehash. ossl_installroot:[EXE]c_rehash.pl
+ @ ! {- output_on() if $disabled{apps}; "" -}
@ ! Install configuration file
- CREATE/DIR ossl_dataroot:[000000]
COPY/PROT=W:RE {- sourcefile("apps", "openssl-vms.cnf") -} -
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 9054f6a..ed64e65 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -86,10 +86,12 @@ DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; }
{- output_on() if $disabled{makedepend}; "" -}
GENERATED={- join(" ", map { (my $x = $_) =~ s|\.S$|\.s|; $x } keys %{$unified_info{generate}}) -}
+{- output_off() if $disabled{apps}; "" -}
BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash
MISC_SCRIPTS=$(SRCDIR)/tools/c_hash $(SRCDIR)/tools/c_info \
$(SRCDIR)/tools/c_issuer $(SRCDIR)/tools/c_name \
$(BLDDIR)/apps/CA.pl $(BLDDIR)/apps/tsget
+{- output_on() if $disabled{apps}; "" -}
SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{libraries}}) -}
@@ -217,12 +219,16 @@ build_tests_nodep: $(TESTPROGS)
test tests: build_tests_nodep build_apps_nodep build_engines_nodep \
depend link-utils
+ @ : {- output_off() if $disabled{tests}; "" -}
( cd test; \
SRCTOP=../$(SRCDIR) \
BLDTOP=../$(BLDDIR) \
EXE_EXT={- $exeext -} \
OPENSSL_ENGINES=../$(BLDDIR)/engines \
$(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) )
+ @ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
+ @echo "Tests are not supported with your chosen Configure options"
+ @ : {- output_on() if !$disabled{tests}; "" -}
list-tests:
@TOP=$(SRCDIR) PERL=$(PERL) $(PERL) $(SRCDIR)/test/run_tests.pl list
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 6a450b1..0c043a0 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -139,10 +139,14 @@ build_tests: configdata.pm build_tests_nodep depend
build_tests_nodep: $(TESTPROGS)
test tests: build_tests_nodep build_apps_nodep build_engines_nodep depend
+ @rem {- output_off() if $disabled{tests}; "" -}
set SRCTOP=$(SRCDIR)
set BLDTOP=$(BLDDIR)
set PERL=$(PERL)
$(PERL) $(SRCDIR)\test\run_tests.pl $(TESTS)
+ @rem {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
+ @echo "Tests are not supported with your chosen Configure options"
+ @rem {- output_on() if !$disabled{tests}; "" -}
list-tests:
@set TOP=$(SRCDIR)
diff --git a/Configure b/Configure
index 90d0846..8192f9e 100755
--- a/Configure
+++ b/Configure
@@ -400,6 +400,12 @@ my @disable_cascades = (
"pic" => [ "shared" ],
"shared" => [ "dynamic-engine" ],
"engine" => [ "afalgeng" ],
+
+ # no-autoalginit is only useful when building non-shared
+ "autoalginit" => [ "shared", "apps" ],
+
+ "stdio" => [ "apps" ],
+ "apps" => [ "tests" ],
"comp" => [ "zlib" ],
sub { !$disabled{"unit-test"} } => [ "heartbeats" ],
);
diff --git a/apps/build.info b/apps/build.info
index d8ad197..3baba66 100644
--- a/apps/build.info
+++ b/apps/build.info
@@ -1,19 +1,21 @@
{- use File::Spec::Functions qw/catdir rel2abs/; -}
-PROGRAMS=openssl
-SOURCE[openssl]=\
- openssl.c \
- asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dhparam.c \
- dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c gendsa.c \
- genpkey.c genrsa.c nseq.c ocsp.c passwd.c pkcs12.c pkcs7.c pkcs8.c \
- pkey.c pkeyparam.c pkeyutl.c prime.c rand.c req.c rsa.c rsautl.c \
- s_client.c s_server.c s_time.c sess_id.c smime.c speed.c spkac.c \
- srp.c ts.c verify.c version.c x509.c rehash.c \
- apps.c opt.c s_cb.c s_socket.c \
- app_rand.c \
- {- $target{apps_aux_src} -}
-INCLUDE[openssl]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[openssl]=../libssl
+IF[{- !$disabled{apps} -}]
+ PROGRAMS=openssl
+ SOURCE[openssl]=\
+ openssl.c \
+ asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dhparam.c \
+ dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c gendsa.c \
+ genpkey.c genrsa.c nseq.c ocsp.c passwd.c pkcs12.c pkcs7.c pkcs8.c \
+ pkey.c pkeyparam.c pkeyutl.c prime.c rand.c req.c rsa.c rsautl.c \
+ s_client.c s_server.c s_time.c sess_id.c smime.c speed.c spkac.c \
+ srp.c ts.c verify.c version.c x509.c rehash.c \
+ apps.c opt.c s_cb.c s_socket.c \
+ app_rand.c \
+ {- $target{apps_aux_src} -}
+ INCLUDE[openssl]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[openssl]=../libssl
-SCRIPTS=CA.pl tsget
-SOURCE[CA.pl]=CA.pl.in
-SOURCE[tsget]=tsget.in
+ SCRIPTS=CA.pl tsget
+ SOURCE[CA.pl]=CA.pl.in
+ SOURCE[tsget]=tsget.in
+ENDIF
diff --git a/test/build.info b/test/build.info
index 3dcddb6..4fd4d99 100644
--- a/test/build.info
+++ b/test/build.info
@@ -1,238 +1,240 @@
{- use File::Spec::Functions qw/catdir rel2abs/; -}
-PROGRAMS=\
- aborttest \
- nptest bntest \
- ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \
- md2test md4test md5test \
- hmactest wp_test \
- rc2test rc4test rc5test \
- destest sha1test sha256t sha512t \
- mdc2test rmdtest \
- randtest dhtest enginetest casttest \
- bftest ssltest_old dsatest exptest rsa_test \
- evp_test evp_extra_test igetest v3nametest \
- danetest heartbeat_test p5_crpt2_test \
- constant_time_test verify_extra_test clienthellotest \
- packettest asynctest secmemtest srptest memleaktest \
- dtlsv1listentest ct_test threadstest afalgtest d2i_test \
- ssl_test_ctx_test ssl_test
-
-SOURCE[aborttest]=aborttest.c
-INCLUDE[aborttest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[aborttest]=../libcrypto
-
-SOURCE[nptest]=nptest.c
-INCLUDE[nptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[nptest]=../libcrypto
-
-SOURCE[bntest]=bntest.c
-INCLUDE[bntest]={- rel2abs(catdir($builddir,"../crypto/include")) -} {- rel2abs(catdir($builddir,"../include")) -} .. ../crypto/include ../include
-DEPEND[bntest]=../libcrypto
-
-SOURCE[ectest]=ectest.c
-INCLUDE[ectest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[ectest]=../libcrypto
-
-SOURCE[ecdsatest]=ecdsatest.c
-INCLUDE[ecdsatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[ecdsatest]=../libcrypto
-
-SOURCE[ecdhtest]=ecdhtest.c
-INCLUDE[ecdhtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[ecdhtest]=../libcrypto
-
-SOURCE[gmdifftest]=gmdifftest.c
-INCLUDE[gmdifftest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[gmdifftest]=../libcrypto
-
-SOURCE[pbelutest]=pbelutest.c
-INCLUDE[pbelutest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[pbelutest]=../libcrypto
-
-SOURCE[ideatest]=ideatest.c
-INCLUDE[ideatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[ideatest]=../libcrypto
-
-SOURCE[md2test]=md2test.c
-INCLUDE[md2test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[md2test]=../libcrypto
-
-SOURCE[md4test]=md4test.c
-INCLUDE[md4test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[md4test]=../libcrypto
-
-SOURCE[md5test]=md5test.c
-INCLUDE[md5test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[md5test]=../libcrypto
-
-SOURCE[hmactest]=hmactest.c
-INCLUDE[hmactest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[hmactest]=../libcrypto
-
-SOURCE[wp_test]=wp_test.c
-INCLUDE[wp_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[wp_test]=../libcrypto
-
-SOURCE[rc2test]=rc2test.c
-INCLUDE[rc2test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[rc2test]=../libcrypto
-
-SOURCE[rc4test]=rc4test.c
-INCLUDE[rc4test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[rc4test]=../libcrypto
-
-SOURCE[rc5test]=rc5test.c
-INCLUDE[rc5test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[rc5test]=../libcrypto
-
-SOURCE[destest]=destest.c
-INCLUDE[destest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[destest]=../libcrypto
-
-SOURCE[sha1test]=sha1test.c
-INCLUDE[sha1test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[sha1test]=../libcrypto
-
-SOURCE[sha256t]=sha256t.c
-INCLUDE[sha256t]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[sha256t]=../libcrypto
-
-SOURCE[sha512t]=sha512t.c
-INCLUDE[sha512t]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[sha512t]=../libcrypto
-
-SOURCE[mdc2test]=mdc2test.c
-INCLUDE[mdc2test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[mdc2test]=../libcrypto
-
-SOURCE[rmdtest]=rmdtest.c
-INCLUDE[rmdtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[rmdtest]=../libcrypto
-
-SOURCE[randtest]=randtest.c
-INCLUDE[randtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[randtest]=../libcrypto
+IF[{- !$disabled{tests} -}]
+ PROGRAMS=\
+ aborttest \
+ nptest bntest \
+ ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \
+ md2test md4test md5test \
+ hmactest wp_test \
+ rc2test rc4test rc5test \
+ destest sha1test sha256t sha512t \
+ mdc2test rmdtest \
+ randtest dhtest enginetest casttest \
+ bftest ssltest_old dsatest exptest rsa_test \
+ evp_test evp_extra_test igetest v3nametest \
+ danetest heartbeat_test p5_crpt2_test \
+ constant_time_test verify_extra_test clienthellotest \
+ packettest asynctest secmemtest srptest memleaktest \
+ dtlsv1listentest ct_test threadstest afalgtest d2i_test \
+ ssl_test_ctx_test ssl_test
+
+ SOURCE[aborttest]=aborttest.c
+ INCLUDE[aborttest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[aborttest]=../libcrypto
+
+ SOURCE[nptest]=nptest.c
+ INCLUDE[nptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[nptest]=../libcrypto
+
+ SOURCE[bntest]=bntest.c
+ INCLUDE[bntest]={- rel2abs(catdir($builddir,"../crypto/include")) -} {- rel2abs(catdir($builddir,"../include")) -} .. ../crypto/include ../include
+ DEPEND[bntest]=../libcrypto
+
+ SOURCE[ectest]=ectest.c
+ INCLUDE[ectest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[ectest]=../libcrypto
+
+ SOURCE[ecdsatest]=ecdsatest.c
+ INCLUDE[ecdsatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[ecdsatest]=../libcrypto
+
+ SOURCE[ecdhtest]=ecdhtest.c
+ INCLUDE[ecdhtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[ecdhtest]=../libcrypto
+
+ SOURCE[gmdifftest]=gmdifftest.c
+ INCLUDE[gmdifftest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[gmdifftest]=../libcrypto
+
+ SOURCE[pbelutest]=pbelutest.c
+ INCLUDE[pbelutest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[pbelutest]=../libcrypto
+
+ SOURCE[ideatest]=ideatest.c
+ INCLUDE[ideatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[ideatest]=../libcrypto
+
+ SOURCE[md2test]=md2test.c
+ INCLUDE[md2test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[md2test]=../libcrypto
+
+ SOURCE[md4test]=md4test.c
+ INCLUDE[md4test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[md4test]=../libcrypto
+
+ SOURCE[md5test]=md5test.c
+ INCLUDE[md5test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[md5test]=../libcrypto
+
+ SOURCE[hmactest]=hmactest.c
+ INCLUDE[hmactest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[hmactest]=../libcrypto
+
+ SOURCE[wp_test]=wp_test.c
+ INCLUDE[wp_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[wp_test]=../libcrypto
+
+ SOURCE[rc2test]=rc2test.c
+ INCLUDE[rc2test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[rc2test]=../libcrypto
+
+ SOURCE[rc4test]=rc4test.c
+ INCLUDE[rc4test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[rc4test]=../libcrypto
+
+ SOURCE[rc5test]=rc5test.c
+ INCLUDE[rc5test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[rc5test]=../libcrypto
+
+ SOURCE[destest]=destest.c
+ INCLUDE[destest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[destest]=../libcrypto
+
+ SOURCE[sha1test]=sha1test.c
+ INCLUDE[sha1test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[sha1test]=../libcrypto
+
+ SOURCE[sha256t]=sha256t.c
+ INCLUDE[sha256t]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[sha256t]=../libcrypto
+
+ SOURCE[sha512t]=sha512t.c
+ INCLUDE[sha512t]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[sha512t]=../libcrypto
+
+ SOURCE[mdc2test]=mdc2test.c
+ INCLUDE[mdc2test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[mdc2test]=../libcrypto
+
+ SOURCE[rmdtest]=rmdtest.c
+ INCLUDE[rmdtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[rmdtest]=../libcrypto
+
+ SOURCE[randtest]=randtest.c
+ INCLUDE[randtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[randtest]=../libcrypto
-SOURCE[dhtest]=dhtest.c
-INCLUDE[dhtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[dhtest]=../libcrypto
+ SOURCE[dhtest]=dhtest.c
+ INCLUDE[dhtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[dhtest]=../libcrypto
-SOURCE[enginetest]=enginetest.c
-INCLUDE[enginetest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[enginetest]=../libcrypto
+ SOURCE[enginetest]=enginetest.c
+ INCLUDE[enginetest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[enginetest]=../libcrypto
-SOURCE[casttest]=casttest.c
-INCLUDE[casttest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[casttest]=../libcrypto
+ SOURCE[casttest]=casttest.c
+ INCLUDE[casttest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[casttest]=../libcrypto
-SOURCE[bftest]=bftest.c
-INCLUDE[bftest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[bftest]=../libcrypto
+ SOURCE[bftest]=bftest.c
+ INCLUDE[bftest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[bftest]=../libcrypto
-SOURCE[ssltest_old]=ssltest_old.c
-INCLUDE[ssltest_old]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[ssltest_old]=../libcrypto ../libssl
+ SOURCE[ssltest_old]=ssltest_old.c
+ INCLUDE[ssltest_old]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[ssltest_old]=../libcrypto ../libssl
-SOURCE[dsatest]=dsatest.c
-INCLUDE[dsatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[dsatest]=../libcrypto
+ SOURCE[dsatest]=dsatest.c
+ INCLUDE[dsatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[dsatest]=../libcrypto
-SOURCE[exptest]=exptest.c
-INCLUDE[exptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[exptest]=../libcrypto
+ SOURCE[exptest]=exptest.c
+ INCLUDE[exptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[exptest]=../libcrypto
-SOURCE[rsa_test]=rsa_test.c
-INCLUDE[rsa_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[rsa_test]=../libcrypto
+ SOURCE[rsa_test]=rsa_test.c
+ INCLUDE[rsa_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[rsa_test]=../libcrypto
-SOURCE[evp_test]=evp_test.c
-INCLUDE[evp_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[evp_test]=../libcrypto
+ SOURCE[evp_test]=evp_test.c
+ INCLUDE[evp_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[evp_test]=../libcrypto
-SOURCE[evp_extra_test]=evp_extra_test.c
-INCLUDE[evp_extra_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[evp_extra_test]=../libcrypto
+ SOURCE[evp_extra_test]=evp_extra_test.c
+ INCLUDE[evp_extra_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[evp_extra_test]=../libcrypto
-SOURCE[igetest]=igetest.c
-INCLUDE[igetest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[igetest]=../libcrypto
+ SOURCE[igetest]=igetest.c
+ INCLUDE[igetest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[igetest]=../libcrypto
-SOURCE[v3nametest]=v3nametest.c
-INCLUDE[v3nametest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[v3nametest]=../libcrypto
+ SOURCE[v3nametest]=v3nametest.c
+ INCLUDE[v3nametest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[v3nametest]=../libcrypto
-SOURCE[danetest]=danetest.c
-INCLUDE[danetest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[danetest]=../libcrypto ../libssl
+ SOURCE[danetest]=danetest.c
+ INCLUDE[danetest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[danetest]=../libcrypto ../libssl
-SOURCE[heartbeat_test]=heartbeat_test.c testutil.c
-INCLUDE[heartbeat_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[heartbeat_test]=../libcrypto ../libssl
+ SOURCE[heartbeat_test]=heartbeat_test.c testutil.c
+ INCLUDE[heartbeat_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[heartbeat_test]=../libcrypto ../libssl
-SOURCE[p5_crpt2_test]=p5_crpt2_test.c
-INCLUDE[p5_crpt2_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[p5_crpt2_test]=../libcrypto
+ SOURCE[p5_crpt2_test]=p5_crpt2_test.c
+ INCLUDE[p5_crpt2_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[p5_crpt2_test]=../libcrypto
-SOURCE[constant_time_test]=constant_time_test.c
-INCLUDE[constant_time_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[constant_time_test]=../libcrypto
+ SOURCE[constant_time_test]=constant_time_test.c
+ INCLUDE[constant_time_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[constant_time_test]=../libcrypto
-SOURCE[verify_extra_test]=verify_extra_test.c
-INCLUDE[verify_extra_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[verify_extra_test]=../libcrypto
+ SOURCE[verify_extra_test]=verify_extra_test.c
+ INCLUDE[verify_extra_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[verify_extra_test]=../libcrypto
-SOURCE[clienthellotest]=clienthellotest.c
-INCLUDE[clienthellotest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[clienthellotest]=../libcrypto ../libssl
+ SOURCE[clienthellotest]=clienthellotest.c
+ INCLUDE[clienthellotest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[clienthellotest]=../libcrypto ../libssl
-SOURCE[packettest]=packettest.c
-INCLUDE[packettest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[packettest]=../libcrypto
+ SOURCE[packettest]=packettest.c
+ INCLUDE[packettest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[packettest]=../libcrypto
-SOURCE[asynctest]=asynctest.c
-INCLUDE[asynctest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[asynctest]=../libcrypto
+ SOURCE[asynctest]=asynctest.c
+ INCLUDE[asynctest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[asynctest]=../libcrypto
-SOURCE[secmemtest]=secmemtest.c
-INCLUDE[secmemtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[secmemtest]=../libcrypto
+ SOURCE[secmemtest]=secmemtest.c
+ INCLUDE[secmemtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[secmemtest]=../libcrypto
-SOURCE[srptest]=srptest.c
-INCLUDE[srptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[srptest]=../libcrypto
+ SOURCE[srptest]=srptest.c
+ INCLUDE[srptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[srptest]=../libcrypto
-SOURCE[memleaktest]=memleaktest.c
-INCLUDE[memleaktest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-DEPEND[memleaktest]=../libcrypto
+ SOURCE[memleaktest]=memleaktest.c
+ INCLUDE[memleaktest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ DEPEND[memleaktest]=../libcrypto
-SOURCE[dtlsv1listentest]=dtlsv1listentest.c
-INCLUDE[dtlsv1listentest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[dtlsv1listentest]=../libssl
+ SOURCE[dtlsv1listentest]=dtlsv1listentest.c
+ INCLUDE[dtlsv1listentest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[dtlsv1listentest]=../libssl
-SOURCE[ct_test]=ct_test.c testutil.c
-INCLUDE[ct_test]={- rel2abs(catdir($builddir,"../include")) -} ../crypto/include ../include
-DEPEND[ct_test]=../libcrypto
+ SOURCE[ct_test]=ct_test.c testutil.c
+ INCLUDE[ct_test]={- rel2abs(catdir($builddir,"../include")) -} ../crypto/include ../include
+ DEPEND[ct_test]=../libcrypto
-SOURCE[threadstest]=threadstest.c
-INCLUDE[threadstest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[threadstest]=../libcrypto
+ SOURCE[threadstest]=threadstest.c
+ INCLUDE[threadstest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[threadstest]=../libcrypto
-SOURCE[afalgtest]=afalgtest.c
-INCLUDE[afalgtest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[afalgtest]=../libcrypto
+ SOURCE[afalgtest]=afalgtest.c
+ INCLUDE[afalgtest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[afalgtest]=../libcrypto
-SOURCE[d2i_test]=d2i_test.c testutil.c
-INCLUDE[d2i_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[d2i_test]=../libcrypto
+ SOURCE[d2i_test]=d2i_test.c testutil.c
+ INCLUDE[d2i_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[d2i_test]=../libcrypto
-SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c testutil.c
-INCLUDE[ssl_test_ctx_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[ssl_test_ctx_test]=../libcrypto
+ SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c testutil.c
+ INCLUDE[ssl_test_ctx_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[ssl_test_ctx_test]=../libcrypto
-SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c testutil.c handshake_helper.c
-INCLUDE[ssl_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
-DEPEND[ssl_test]=../libcrypto ../libssl
+ SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c testutil.c handshake_helper.c
+ INCLUDE[ssl_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
+ DEPEND[ssl_test]=../libcrypto ../libssl
-INCLUDE[testutil.o]=..
-INCLUDE[ssl_test_ctx.o]={- rel2abs(catdir($builddir,"../include")) -} ../include
-INCLUDE[handshake_helper.o]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ INCLUDE[testutil.o]=..
+ INCLUDE[ssl_test_ctx.o]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ INCLUDE[handshake_helper.o]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ENDIF
diff --git a/tools/build.info b/tools/build.info
index 4010fd4..3810fbc 100644
--- a/tools/build.info
+++ b/tools/build.info
@@ -1,2 +1,4 @@
-SCRIPTS=c_rehash
-SOURCE[c_rehash]=c_rehash.in
+IF[{- !$disabled{apps} -}]
+ SCRIPTS=c_rehash
+ SOURCE[c_rehash]=c_rehash.in
+ENDIF
More information about the openssl-commits
mailing list