[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Wed Jan 31 22:45:17 UTC 2018
The branch master has been updated
via 0ac9e9ff5de278fed705a2bf090ed92b5911656b (commit)
via d6baf09fe0c9efe4fe87e16fed088b9ce2b4c3f1 (commit)
via dab2cd68e7cc304c9b1a4e7cee18a98711771a53 (commit)
from 79a0e87648bb932d88f117e96dabd2c4eb44cb99 (commit)
- Log -----------------------------------------------------------------
commit 0ac9e9ff5de278fed705a2bf090ed92b5911656b
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Jan 31 14:18:54 2018 +0100
Make test/uitest depend on the private apps support library
This avoids having to enumerate specific modules in apps, or to have
to include them in libtestutil.a.
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5222)
commit d6baf09fe0c9efe4fe87e16fed088b9ce2b4c3f1
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Jan 31 14:15:52 2018 +0100
Apps: divide the modules in direct command modules, support library and init
Most modules are direct implementations of openssl application
sub-commands, but some constitute a support library, which can be used
by more than one program (and is, incidently, by test/uitest).
For practical purposes, we place the support library modules in a
private, static library.
Finally, there are some modules that don't have direct references in
the rest of the apps code, but are still crucial. See them as some
kind of extra crt0 or similar for your platform.
Inspiration from David von Oheimb
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5222)
commit dab2cd68e7cc304c9b1a4e7cee18a98711771a53
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Jan 31 11:13:10 2018 +0100
apps: Don't include progs.h in apps.h
Everything in apps includes apps.h, because that one declares apps
internal library routines. However, progs.h doesn't declare library
routines, but rather the main commands and their options, and there's
no reason why the library modules should include it.
So, remove the inclusion of progs.h from apps.h and add that inclusion
in all command source files.
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5222)
-----------------------------------------------------------------------
Summary of changes:
Configurations/00-base-templates.conf | 3 ++-
Configurations/10-main.conf | 3 ++-
Configurations/README | 10 ++++++++--
Configurations/windows-checker.pm | 2 +-
apps/apps.h | 2 --
apps/asn1pars.c | 1 +
apps/build.info | 28 +++++++++++++++++-----------
apps/ca.c | 1 +
apps/ciphers.c | 1 +
apps/cms.c | 1 +
apps/crl.c | 1 +
apps/crl2p7.c | 1 +
apps/dgst.c | 1 +
apps/dhparam.c | 1 +
apps/dsa.c | 1 +
apps/dsaparam.c | 1 +
apps/ec.c | 1 +
apps/ecparam.c | 1 +
apps/enc.c | 1 +
apps/engine.c | 1 +
apps/errstr.c | 1 +
apps/gendsa.c | 1 +
apps/genpkey.c | 1 +
apps/genrsa.c | 1 +
apps/nseq.c | 1 +
apps/ocsp.c | 1 +
apps/openssl.c | 3 ++-
apps/passwd.c | 1 +
apps/pkcs12.c | 1 +
apps/pkcs7.c | 1 +
apps/pkcs8.c | 1 +
apps/pkey.c | 1 +
apps/pkeyparam.c | 1 +
apps/pkeyutl.c | 1 +
apps/prime.c | 1 +
apps/rand.c | 1 +
apps/rehash.c | 1 +
apps/req.c | 1 +
apps/rsa.c | 1 +
apps/rsautl.c | 1 +
apps/s_client.c | 1 +
apps/s_server.c | 1 +
apps/s_time.c | 1 +
apps/sess_id.c | 1 +
apps/smime.c | 1 +
apps/speed.c | 1 +
apps/spkac.c | 1 +
apps/srp.c | 1 +
apps/storeutl.c | 1 +
apps/ts.c | 1 +
apps/verify.c | 1 +
apps/version.c | 1 +
apps/x509.c | 1 +
test/build.info | 7 ++++---
54 files changed, 82 insertions(+), 22 deletions(-)
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 72cbde2..0d0f8b8 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -11,6 +11,7 @@ my %targets=(
thread_defines => [],
apps_aux_src => "",
+ apps_init_src => "",
cpuid_asm_src => "mem_clr.c",
uplink_aux_src => "",
bn_asm_src => "bn_asm.c",
@@ -134,7 +135,7 @@ my %targets=(
uplink_common => {
template => 1,
- apps_aux_src => add("../ms/applink.c"),
+ apps_init_src => add("../ms/applink.c"),
uplink_aux_src => add("../ms/uplink.c"),
defines => add("OPENSSL_USE_APPLINK"),
},
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 62fbb60..70b0104 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1852,7 +1852,8 @@ my %targets = (
dso_scheme => "vms",
thread_scheme => "pthreads",
- apps_aux_src => "vms_decc_init.c vms_term_sock.c",
+ apps_aux_src => "vms_term_sock.c",
+ apps_init_src => "vms_decc_init.c",
},
"vms-alpha" => {
diff --git a/Configurations/README b/Configurations/README
index aa0c5fb..26cd0c6 100644
--- a/Configurations/README
+++ b/Configurations/README
@@ -212,8 +212,14 @@ In each table entry, the following keys are significant:
export vars as
accessor functions.
- apps_extra_src => Extra source to build apps/openssl, as
- needed by the target.
+ apps_aux_src => Extra source to build apps/openssl and other
+ apps, as needed by the target and that can be
+ collected in a library.
+ apps_init_src => Init source to build apps/openssl and other
+ apps, as needed by the target. This code
+ cannot be placed in a library, as the rest
+ of the code isn't expected to link to it
+ explicitely.
cpuid_asm_src => assembler implementation of cpuid code as
well as OPENSSL_cleanse().
Default to mem_clr.c
diff --git a/Configurations/windows-checker.pm b/Configurations/windows-checker.pm
index de46fbc..4b7105d 100644
--- a/Configurations/windows-checker.pm
+++ b/Configurations/windows-checker.pm
@@ -6,7 +6,7 @@ use Config;
# we expect for the platform
use File::Spec::Functions qw(:DEFAULT rel2abs);
-if (rel2abs('.') !~ m|\\|) {
+if (!$ENV{CONFIGURE_INSIST} && rel2abs('.') !~ m|\\|) {
die <<EOF;
******************************************************************************
diff --git a/apps/apps.h b/apps/apps.h
index 601797b..a740ad4 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -600,6 +600,4 @@ typedef struct verify_options_st {
extern VERIFY_CB_ARGS verify_args;
-# include "progs.h"
-
#endif
diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 56a9adc..f1d3211 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
diff --git a/apps/build.info b/apps/build.info
index 996e5a6..4a36ab5 100644
--- a/apps/build.info
+++ b/apps/build.info
@@ -1,21 +1,27 @@
{- our $tsget_name = $config{target} =~ /^(VC|vms)-/ ? "tsget.pl" : "tsget";
our @apps_openssl_src =
- ( qw(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 storeutl.c
- apps.c opt.c s_cb.c s_socket.c
- app_rand.c),
- split(/\s+/, $target{apps_aux_src}) );
+ qw(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 storeutl.c);
+ our @apps_lib_src =
+ ( qw(apps.c opt.c s_cb.c s_socket.c app_rand.c),
+ split(/\s+/, $target{apps_aux_src}) );
+ our @apps_init_src = split(/\s+/, $target{apps_init_src});
"" -}
IF[{- !$disabled{apps} -}]
+ LIBS_NO_INST=libapps.a
+ SOURCE[libapps.a]={- join(" ", @apps_lib_src) -}
+ INCLUDE[libapps.a]=.. ../include
+
PROGRAMS=openssl
+ SOURCE[openssl]={- join(" ", @apps_init_src) -}
SOURCE[openssl]={- join(" ", @apps_openssl_src) -}
INCLUDE[openssl]=.. ../include
- DEPEND[openssl]=../libssl
+ DEPEND[openssl]=libapps.a ../libssl
{- join("\n ", map { (my $x = $_) =~ s|\.c$|.o|; "DEPEND[$x]=progs.h" }
@apps_openssl_src) -}
diff --git a/apps/ca.c b/apps/ca.c
index 9b1d9bd..477d8b4 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -32,6 +32,7 @@
#endif
#include "apps.h"
+#include "progs.h"
#ifndef W_OK
# define F_OK 0
diff --git a/apps/ciphers.c b/apps/ciphers.c
index d171b86..744589d 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/err.h>
#include <openssl/ssl.h>
diff --git a/apps/cms.c b/apps/cms.c
index 45ab259..e9d760c 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#ifndef OPENSSL_NO_CMS
diff --git a/apps/crl.c b/apps/crl.c
index 5e1f109..c81c323 100644
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/x509.h>
diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 79217e9..282e3cc 100644
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -11,6 +11,7 @@
#include <string.h>
#include <sys/types.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
diff --git a/apps/dgst.c b/apps/dgst.c
index ba63e12..80e8e84 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -11,6 +11,7 @@
#include <string.h>
#include <stdlib.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/evp.h>
diff --git a/apps/dhparam.c b/apps/dhparam.c
index 2a78ce2..82ecc94 100644
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -17,6 +17,7 @@ NON_EMPTY_TRANSLATION_UNIT
# include <time.h>
# include <string.h>
# include "apps.h"
+# include "progs.h"
# include <openssl/bio.h>
# include <openssl/err.h>
# include <openssl/bn.h>
diff --git a/apps/dsa.c b/apps/dsa.c
index 74a68ff..e9b6f05 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -17,6 +17,7 @@ NON_EMPTY_TRANSLATION_UNIT
# include <string.h>
# include <time.h>
# include "apps.h"
+# include "progs.h"
# include <openssl/bio.h>
# include <openssl/err.h>
# include <openssl/dsa.h>
diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index ff66fcc..69a85aa 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -17,6 +17,7 @@ NON_EMPTY_TRANSLATION_UNIT
# include <time.h>
# include <string.h>
# include "apps.h"
+# include "progs.h"
# include <openssl/bio.h>
# include <openssl/err.h>
# include <openssl/bn.h>
diff --git a/apps/ec.c b/apps/ec.c
index 6fc6a6f..c9d7ded 100644
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -16,6 +16,7 @@ NON_EMPTY_TRANSLATION_UNIT
# include <stdlib.h>
# include <string.h>
# include "apps.h"
+# include "progs.h"
# include <openssl/bio.h>
# include <openssl/err.h>
# include <openssl/evp.h>
diff --git a/apps/ecparam.c b/apps/ecparam.c
index 1f3770e..5e6ee2a 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -18,6 +18,7 @@ NON_EMPTY_TRANSLATION_UNIT
# include <time.h>
# include <string.h>
# include "apps.h"
+# include "progs.h"
# include <openssl/bio.h>
# include <openssl/err.h>
# include <openssl/bn.h>
diff --git a/apps/enc.c b/apps/enc.c
index af88259..5153251 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -12,6 +12,7 @@
#include <string.h>
#include <limits.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/evp.h>
diff --git a/apps/engine.c b/apps/engine.c
index 8ada13d..328fe1f 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -13,6 +13,7 @@ NON_EMPTY_TRANSLATION_UNIT
#else
# include "apps.h"
+# include "progs.h"
# include <stdio.h>
# include <stdlib.h>
# include <string.h>
diff --git a/apps/errstr.c b/apps/errstr.c
index 3ce4acf..af33a68 100644
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
diff --git a/apps/gendsa.c b/apps/gendsa.c
index c57511c..14bfeac 100644
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -17,6 +17,7 @@ NON_EMPTY_TRANSLATION_UNIT
# include <sys/types.h>
# include <sys/stat.h>
# include "apps.h"
+# include "progs.h"
# include <openssl/bio.h>
# include <openssl/err.h>
# include <openssl/bn.h>
diff --git a/apps/genpkey.c b/apps/genpkey.c
index 469ea1c..7e7a1cc 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -10,6 +10,7 @@
#include <stdio.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/evp.h>
diff --git a/apps/genrsa.c b/apps/genrsa.c
index f147852..93df823 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -17,6 +17,7 @@ NON_EMPTY_TRANSLATION_UNIT
# include <sys/types.h>
# include <sys/stat.h>
# include "apps.h"
+# include "progs.h"
# include <openssl/bio.h>
# include <openssl/err.h>
# include <openssl/bn.h>
diff --git a/apps/nseq.c b/apps/nseq.c
index 82850b8..fe6eab8 100644
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -10,6 +10,7 @@
#include <stdio.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/pem.h>
#include <openssl/err.h>
diff --git a/apps/ocsp.c b/apps/ocsp.c
index 4a68e52..122aee6 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -25,6 +25,7 @@ NON_EMPTY_TRANSLATION_UNIT
/* Needs to be included before the openssl headers */
# include "apps.h"
+# include "progs.h"
# include <openssl/e_os2.h>
# include <openssl/crypto.h>
# include <openssl/err.h>
diff --git a/apps/openssl.c b/apps/openssl.c
index 8b75a8a..fe1eabd 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -27,8 +27,9 @@
#ifdef OPENSSL_SYS_VMS
# include <unixio.h>
#endif
-#define INCLUDE_FUNCTION_TABLE
#include "apps.h"
+#define INCLUDE_FUNCTION_TABLE
+#include "progs.h"
/* Structure to hold the number of columns to be displayed and the
* field width used to display them.
diff --git a/apps/passwd.c b/apps/passwd.c
index 85e7a6e..a01f1e7 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -10,6 +10,7 @@
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bio.h>
#include <openssl/err.h>
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 6a2f7c0..1a353e1 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -16,6 +16,7 @@ NON_EMPTY_TRANSLATION_UNIT
# include <stdlib.h>
# include <string.h>
# include "apps.h"
+# include "progs.h"
# include <openssl/crypto.h>
# include <openssl/err.h>
# include <openssl/pem.h>
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 8dc7792..afeae64 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -12,6 +12,7 @@
#include <string.h>
#include <time.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/err.h>
#include <openssl/objects.h>
#include <openssl/evp.h>
diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index dfc23e5..ca6ab01 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/evp.h>
diff --git a/apps/pkey.c b/apps/pkey.c
index 6160e5a..0e961dd 100644
--- a/apps/pkey.c
+++ b/apps/pkey.c
@@ -10,6 +10,7 @@
#include <stdio.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/evp.h>
diff --git a/apps/pkeyparam.c b/apps/pkeyparam.c
index 35cdd8d..b3c610b 100644
--- a/apps/pkeyparam.c
+++ b/apps/pkeyparam.c
@@ -10,6 +10,7 @@
#include <stdio.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/evp.h>
diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index 07646c8..e24782f 100644
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -8,6 +8,7 @@
*/
#include "apps.h"
+#include "progs.h"
#include <string.h>
#include <openssl/err.h>
#include <openssl/pem.h>
diff --git a/apps/prime.c b/apps/prime.c
index 9aa32d0..27f4e28 100644
--- a/apps/prime.c
+++ b/apps/prime.c
@@ -10,6 +10,7 @@
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bn.h>
typedef enum OPTION_choice {
diff --git a/apps/rand.c b/apps/rand.c
index 0ab22a9..b9f4598 100644
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -8,6 +8,7 @@
*/
#include "apps.h"
+#include "progs.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/apps/rehash.c b/apps/rehash.c
index c14bce4..e049bfe 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -9,6 +9,7 @@
*/
#include "apps.h"
+#include "progs.h"
#if defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) || \
(defined(__VMS) && defined(__DECC) && __CRTL_VER >= 80300000)
diff --git a/apps/req.c b/apps/req.c
index dca6038..f67f93a 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -12,6 +12,7 @@
#include <time.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/conf.h>
diff --git a/apps/rsa.c b/apps/rsa.c
index 698c046..d7a5ab8 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -17,6 +17,7 @@ NON_EMPTY_TRANSLATION_UNIT
# include <string.h>
# include <time.h>
# include "apps.h"
+# include "progs.h"
# include <openssl/bio.h>
# include <openssl/err.h>
# include <openssl/rsa.h>
diff --git a/apps/rsautl.c b/apps/rsautl.c
index ca9cb79..f146a48 100644
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -13,6 +13,7 @@ NON_EMPTY_TRANSLATION_UNIT
#else
# include "apps.h"
+# include "progs.h"
# include <string.h>
# include <openssl/err.h>
# include <openssl/pem.h>
diff --git a/apps/s_client.c b/apps/s_client.c
index 814a52a..774345e 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -30,6 +30,7 @@ typedef unsigned int u_int;
#endif
#include "apps.h"
+#include "progs.h"
#include <openssl/x509.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
diff --git a/apps/s_server.c b/apps/s_server.c
index bbe44f7..f124b12 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -37,6 +37,7 @@ typedef unsigned int u_int;
#include <openssl/bn.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/err.h>
#include <openssl/pem.h>
#include <openssl/x509.h>
diff --git a/apps/s_time.c b/apps/s_time.c
index 7e24988..b5c8b63 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -18,6 +18,7 @@
#ifndef OPENSSL_NO_SOCK
#include "apps.h"
+#include "progs.h"
#include <openssl/x509.h>
#include <openssl/ssl.h>
#include <openssl/pem.h>
diff --git a/apps/sess_id.c b/apps/sess_id.c
index f0c76b1..838a63d 100644
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/x509.h>
diff --git a/apps/smime.c b/apps/smime.c
index 43d6370..1c00b0f 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/crypto.h>
#include <openssl/pem.h>
#include <openssl/err.h>
diff --git a/apps/speed.c b/apps/speed.c
index db4b14f..c59f266 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -20,6 +20,7 @@
#include <string.h>
#include <math.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/crypto.h>
#include <openssl/rand.h>
#include <openssl/err.h>
diff --git a/apps/spkac.c b/apps/spkac.c
index c081751..eeee6e3 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -12,6 +12,7 @@
#include <string.h>
#include <time.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bio.h>
#include <openssl/conf.h>
#include <openssl/err.h>
diff --git a/apps/srp.c b/apps/srp.c
index b8fcf71..123b557 100644
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -22,6 +22,7 @@ NON_EMPTY_TRANSLATION_UNIT
# include <openssl/buffer.h>
# include <openssl/srp.h>
# include "apps.h"
+# include "progs.h"
# define BASE_SECTION "srp"
# define CONFIG_FILE "openssl.cnf"
diff --git a/apps/storeutl.c b/apps/storeutl.c
index 77f0f3f..55a11e5 100644
--- a/apps/storeutl.c
+++ b/apps/storeutl.c
@@ -10,6 +10,7 @@
#include <openssl/opensslconf.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/err.h>
#include <openssl/pem.h>
#include <openssl/store.h>
diff --git a/apps/ts.c b/apps/ts.c
index 96da50e..13cca9e 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -15,6 +15,7 @@ NON_EMPTY_TRANSLATION_UNIT
# include <stdlib.h>
# include <string.h>
# include "apps.h"
+# include "progs.h"
# include <openssl/bio.h>
# include <openssl/err.h>
# include <openssl/pem.h>
diff --git a/apps/verify.c b/apps/verify.c
index 1dccf76..765782e 100644
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/x509.h>
diff --git a/apps/version.c b/apps/version.c
index 7fc9a27..5066482 100644
--- a/apps/version.c
+++ b/apps/version.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/evp.h>
#include <openssl/crypto.h>
#include <openssl/bn.h>
diff --git a/apps/x509.c b/apps/x509.c
index 001c395..7803124 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bio.h>
#include <openssl/asn1.h>
#include <openssl/err.h>
diff --git a/test/build.info b/test/build.info
index f91800a..c3c7f1e 100644
--- a/test/build.info
+++ b/test/build.info
@@ -12,7 +12,6 @@ IF[{- !$disabled{tests} -}]
SOURCE[libtestutil.a]=testutil/basic_output.c testutil/output_helpers.c \
testutil/driver.c testutil/tests.c testutil/cb.c testutil/stanza.c \
testutil/format_output.c testutil/tap_bio.c \
- {- rebase_files("../apps", $target{apps_aux_src}) -} \
testutil/test_cleanup.c testutil/main.c testutil/init.c
INCLUDE[libtestutil.a]=../include
DEPEND[libtestutil.a]=../libcrypto
@@ -369,9 +368,11 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
DEPEND[cipher_overhead_test]=../libcrypto ../libssl libtestutil.a
ENDIF
- SOURCE[uitest]=uitest.c ../apps/apps.c ../apps/opt.c
+ SOURCE[uitest]=uitest.c \
+ {- rebase_files("../apps",
+ split(/\s+/, $target{apps_init_src})) -}
INCLUDE[uitest]=.. ../include ../apps
- DEPEND[uitest]=../libcrypto ../libssl libtestutil.a
+ DEPEND[uitest]=../apps/libapps.a ../libcrypto ../libssl libtestutil.a
SOURCE[cipherbytes_test]=cipherbytes_test.c
INCLUDE[cipherbytes_test]=../include
More information about the openssl-commits
mailing list