Commit dab2cd68 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5222)
parent 79a0e876

apps/apps.h

+0 −2
Original line number Diff line number Diff line
@@ -600,6 +600,4 @@ typedef struct verify_options_st { 


extern VERIFY_CB_ARGS verify_args;



# include "progs.h"



#endif

apps/asn1pars.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

apps/ca.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#endif



#include "apps.h"

#include "progs.h"



#ifndef W_OK

# define F_OK 0

apps/ciphers.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <stdlib.h>

#include <string.h>

#include "apps.h"

#include "progs.h"

#include <openssl/err.h>

#include <openssl/ssl.h>

apps/cms.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <stdio.h>

#include <string.h>

#include "apps.h"

#include "progs.h"



#ifndef OPENSSL_NO_CMS