From: Richard Levitte <levitte@openssl.org>
Date: Wed, 31 Jan 2018 10:13:10 +0000 (+0100)
Subject: apps: Don't include progs.h in apps.h
X-Git-Tag: OpenSSL_1_1_1-pre1~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dab2cd68e7cc304c9b1a4e7cee18a98711771a53;p=thirdparty%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5222)
---

diff --git a/apps/apps.h b/apps/apps.h
index 601797b1b66..a740ad4599a 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 56a9adc2ffc..f1d32116262 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/ca.c b/apps/ca.c
index 9b1d9bdaac8..477d8b4aa08 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 d171b865eb9..744589da847 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 45ab2597065..e9d760c999b 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 5e1f109a6bd..c81c3233159 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 79217e9efce..282e3cc5fb6 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 ba63e123dee..80e8e843b26 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 2a78ce28fc7..82ecc94a8f7 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 74a68ff64b4..e9b6f05ca9c 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 ff66fcc64c7..69a85aa2f6f 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 6fc6a6f6253..c9d7ded070d 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 1f3770e2847..5e6ee2a3b48 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 af882598cc1..5153251b312 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 8ada13dce56..328fe1ff762 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 3ce4acf744e..af33a68c8c8 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 c57511cfa1f..14bfeacd8f4 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 469ea1c943c..7e7a1cc2931 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 f1478529028..93df8230830 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 82850b81180..fe6eab8c60f 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 4a68e52d743..122aee6770e 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 8b75a8affbf..fe1eabdede7 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 85e7a6ebcd2..a01f1e7dcdc 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 6a2f7c00436..1a353e169dc 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 8dc77927f19..afeae64fba0 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 dfc23e5b59b..ca6ab0156fd 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 6160e5a381d..0e961dd95e2 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 35cdd8dc928..b3c610b2f39 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 07646c86393..e24782fc52f 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 9aa32d02b07..27f4e2849b1 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 0ab22a99c85..b9f4598f661 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 c14bce4007b..e049bfeb492 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 dca6038a285..f67f93a1f79 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 698c046437c..d7a5ab8da9e 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 ca9cb791c7b..f146a489a9b 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 814a52a9349..774345e256d 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 bbe44f79a47..f124b12a489 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 7e249887213..b5c8b6324f7 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 f0c76b1917c..838a63d4e6c 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 43d63704f99..1c00b0f439f 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 db4b14fab69..c59f266fc90 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 c0817517c29..eeee6e398ea 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 b8fcf71609c..123b5579b0d 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 77f0f3f0f57..55a11e594d1 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 96da50e51e7..13cca9e0257 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 1dccf761300..765782e9c88 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 7fc9a27d678..5066482a07c 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 001c3959aa3..78031247292 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>