diff options
Diffstat (limited to 'lib/libssl/src')
50 files changed, 308 insertions, 214 deletions
diff --git a/lib/libssl/src/apps/apps.c b/lib/libssl/src/apps/apps.c index a96de0cd9a2..7f019564c11 100644 --- a/lib/libssl/src/apps/apps.c +++ b/lib/libssl/src/apps/apps.c @@ -111,32 +111,34 @@ #include <sys/types.h> #include <sys/stat.h> + +#include <assert.h> +#include <ctype.h> +#include <errno.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <strings.h> -#include <ctype.h> -#include <errno.h> -#include <assert.h> #include <unistd.h> +#include "apps.h" + +#include <openssl/bn.h> #include <openssl/err.h> -#include <openssl/x509.h> -#include <openssl/x509v3.h> #include <openssl/pem.h> #include <openssl/pkcs12.h> -#include <openssl/ui.h> #include <openssl/safestack.h> +#include <openssl/ui.h> +#include <openssl/x509.h> +#include <openssl/x509v3.h> + #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #endif + #ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> #endif -#include <openssl/bn.h> - -#include "apps.h" - typedef struct { const char *name; diff --git a/lib/libssl/src/apps/apps.h b/lib/libssl/src/apps/apps.h index cbbf0eaefd5..31b2c8d18f2 100644 --- a/lib/libssl/src/apps/apps.h +++ b/lib/libssl/src/apps/apps.h @@ -112,26 +112,28 @@ #ifndef HEADER_APPS_H #define HEADER_APPS_H -#include <openssl/e_os2.h> +#include <signal.h> + #include <openssl/bio.h> -#include <openssl/x509.h> -#include <openssl/lhash.h> #include <openssl/conf.h> +#include <openssl/e_os2.h> +#include <openssl/lhash.h> +#include <openssl/ossl_typ.h> #include <openssl/txt_db.h> +#include <openssl/x509.h> + #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #endif + #ifndef OPENSSL_NO_OCSP #include <openssl/ocsp.h> #endif -#include <openssl/ossl_typ.h> extern CONF *config; extern char *default_config_file; extern BIO *bio_err; -#include <signal.h> - typedef struct args_st { char **data; int count; diff --git a/lib/libssl/src/apps/asn1pars.c b/lib/libssl/src/apps/asn1pars.c index a8af0aa4e9d..2d56487669d 100644 --- a/lib/libssl/src/apps/asn1pars.c +++ b/lib/libssl/src/apps/asn1pars.c @@ -63,11 +63,13 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" + #include <openssl/err.h> #include <openssl/evp.h> -#include <openssl/x509.h> #include <openssl/pem.h> +#include <openssl/x509.h> /* -inform arg - input format - default PEM (DER or PEM) * -in arg - input file - default stdin @@ -77,7 +79,6 @@ * -oid file - extra oid description file */ - int asn1parse_main(int, char **); static int do_generate(BIO * bio, char *genstr, char *genconf, BUF_MEM * buf); diff --git a/lib/libssl/src/apps/ca.c b/lib/libssl/src/apps/ca.c index c7715988025..23c13186995 100644 --- a/lib/libssl/src/apps/ca.c +++ b/lib/libssl/src/apps/ca.c @@ -58,29 +58,31 @@ /* The PPKI stuff has been donated by Jeff Barber <jeffb@issl.atl.hp.com> */ +#include <sys/types.h> + +#ifndef W_OK +#include <sys/file.h> +#endif + +#include <ctype.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <ctype.h> #include <unistd.h> -#include <sys/types.h> -#include <openssl/conf.h> + +#include "apps.h" + #include <openssl/bio.h> -#include <openssl/err.h> #include <openssl/bn.h> -#include <openssl/txt_db.h> +#include <openssl/conf.h> +#include <openssl/err.h> #include <openssl/evp.h> -#include <openssl/x509.h> -#include <openssl/x509v3.h> #include <openssl/objects.h> #include <openssl/ocsp.h> #include <openssl/pem.h> - -#ifndef W_OK -#include <sys/file.h> -#endif - -#include "apps.h" +#include <openssl/txt_db.h> +#include <openssl/x509.h> +#include <openssl/x509v3.h> #ifndef W_OK #define F_OK 0 @@ -89,7 +91,6 @@ #define R_OK 4 #endif - #define BASE_SECTION "ca" #define ENV_DEFAULT_CA "default_ca" diff --git a/lib/libssl/src/apps/ciphers.c b/lib/libssl/src/apps/ciphers.c index 70d9a894096..0e3b8277dac 100644 --- a/lib/libssl/src/apps/ciphers.c +++ b/lib/libssl/src/apps/ciphers.c @@ -59,11 +59,12 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" + #include <openssl/err.h> #include <openssl/ssl.h> - static const char *ciphers_usage[] = { "usage: ciphers args\n", " -v - verbose mode, a textual listing of the SSL/TLS ciphers in OpenSSL\n", diff --git a/lib/libssl/src/apps/cms.c b/lib/libssl/src/apps/cms.c index fa1bd9a3a2e..01b4a2a2621 100644 --- a/lib/libssl/src/apps/cms.c +++ b/lib/libssl/src/apps/cms.c @@ -55,16 +55,17 @@ #include <stdio.h> #include <string.h> + #include "apps.h" #ifndef OPENSSL_NO_CMS +#include <openssl/cms.h> #include <openssl/crypto.h> -#include <openssl/pem.h> #include <openssl/err.h> +#include <openssl/pem.h> #include <openssl/x509_vfy.h> #include <openssl/x509v3.h> -#include <openssl/cms.h> static int save_certs(char *signerfile, STACK_OF(X509) * signers); static int cms_cb(int ok, X509_STORE_CTX * ctx); diff --git a/lib/libssl/src/apps/crl.c b/lib/libssl/src/apps/crl.c index 50ac0e118d5..0d17ba91539 100644 --- a/lib/libssl/src/apps/crl.c +++ b/lib/libssl/src/apps/crl.c @@ -59,13 +59,14 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" + #include <openssl/bio.h> #include <openssl/err.h> +#include <openssl/pem.h> #include <openssl/x509.h> #include <openssl/x509v3.h> -#include <openssl/pem.h> - #define POSTFIX ".rvk" diff --git a/lib/libssl/src/apps/crl2p7.c b/lib/libssl/src/apps/crl2p7.c index f972a394d69..9d3552ab888 100644 --- a/lib/libssl/src/apps/crl2p7.c +++ b/lib/libssl/src/apps/crl2p7.c @@ -60,16 +60,19 @@ * and donated 'to the cause' along with lots and lots of other fixes to * the library. */ +#include <sys/types.h> + #include <stdio.h> #include <string.h> -#include <sys/types.h> + #include "apps.h" + #include <openssl/err.h> #include <openssl/evp.h> -#include <openssl/x509.h> -#include <openssl/pkcs7.h> -#include <openssl/pem.h> #include <openssl/objects.h> +#include <openssl/pem.h> +#include <openssl/pkcs7.h> +#include <openssl/x509.h> static int add_certs_from_file(STACK_OF(X509) * stack, char *certfile); diff --git a/lib/libssl/src/apps/dgst.c b/lib/libssl/src/apps/dgst.c index f2c228cc3d3..c1832297b2e 100644 --- a/lib/libssl/src/apps/dgst.c +++ b/lib/libssl/src/apps/dgst.c @@ -57,20 +57,21 @@ */ #include <stdio.h> -#include <string.h> #include <stdlib.h> +#include <string.h> + #include "apps.h" + #include <openssl/bio.h> #include <openssl/err.h> #include <openssl/evp.h> +#include <openssl/hmac.h> #include <openssl/objects.h> -#include <openssl/x509.h> #include <openssl/pem.h> -#include <openssl/hmac.h> +#include <openssl/x509.h> #define BUFSIZE 1024*8 - int do_fp(BIO * out, unsigned char *buf, BIO * bp, int sep, int binout, EVP_PKEY * key, unsigned char *sigin, int siglen, diff --git a/lib/libssl/src/apps/dh.c b/lib/libssl/src/apps/dh.c index 7e5e1427604..e7e6e1d874c 100644 --- a/lib/libssl/src/apps/dh.c +++ b/lib/libssl/src/apps/dh.c @@ -57,20 +57,23 @@ * [including the GNU Public Licence.] */ -#include <openssl/opensslconf.h>/* for OPENSSL_NO_DH */ +#include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */ + #ifndef OPENSSL_NO_DH + #include <stdio.h> #include <stdlib.h> -#include <time.h> #include <string.h> +#include <time.h> + #include "apps.h" + #include <openssl/bio.h> -#include <openssl/err.h> #include <openssl/bn.h> +#include <openssl/err.h> #include <openssl/dh.h> -#include <openssl/x509.h> #include <openssl/pem.h> - +#include <openssl/x509.h> /* -inform arg - input format - default PEM (DER or PEM) * -outform arg - output format - default PEM diff --git a/lib/libssl/src/apps/dhparam.c b/lib/libssl/src/apps/dhparam.c index 0cb99c53409..3973ad05862 100644 --- a/lib/libssl/src/apps/dhparam.c +++ b/lib/libssl/src/apps/dhparam.c @@ -109,25 +109,28 @@ * */ -#include <openssl/opensslconf.h>/* for OPENSSL_NO_DH */ +#include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */ + #ifndef OPENSSL_NO_DH + #include <stdio.h> #include <stdlib.h> -#include <time.h> #include <string.h> +#include <time.h> + #include "apps.h" + #include <openssl/bio.h> -#include <openssl/err.h> #include <openssl/bn.h> +#include <openssl/err.h> #include <openssl/dh.h> -#include <openssl/x509.h> #include <openssl/pem.h> +#include <openssl/x509.h> #ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> #endif - #define DEFBITS 512 /* -inform arg - input format - default PEM (DER or PEM) diff --git a/lib/libssl/src/apps/dsa.c b/lib/libssl/src/apps/dsa.c index 81040193c73..4026ba5d229 100644 --- a/lib/libssl/src/apps/dsa.c +++ b/lib/libssl/src/apps/dsa.c @@ -56,21 +56,24 @@ * [including the GNU Public Licence.] */ -#include <openssl/opensslconf.h>/* for OPENSSL_NO_DSA */ +#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */ + #ifndef OPENSSL_NO_DSA + #include <stdio.h> #include <stdlib.h> -#include <string.h> #include <time.h> +#include <string.h> + #include "apps.h" + #include <openssl/bio.h> -#include <openssl/err.h> +#include <openssl/bn.h> #include <openssl/dsa.h> +#include <openssl/err.h> #include <openssl/evp.h> -#include <openssl/x509.h> #include <openssl/pem.h> -#include <openssl/bn.h> - +#include <openssl/x509.h> /* -inform arg - input format - default PEM (one of DER, NET or PEM) * -outform arg - output format - default PEM diff --git a/lib/libssl/src/apps/dsaparam.c b/lib/libssl/src/apps/dsaparam.c index 6488c4b69d2..75ffa60e1ed 100644 --- a/lib/libssl/src/apps/dsaparam.c +++ b/lib/libssl/src/apps/dsaparam.c @@ -56,7 +56,8 @@ * [including the GNU Public Licence.] */ -#include <openssl/opensslconf.h>/* for OPENSSL_NO_DSA */ +#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */ + /* Until the key-gen callbacks are modified to use newer prototypes, we allow * deprecated functions for openssl-internal code */ #ifdef OPENSSL_NO_DEPRECATED @@ -64,19 +65,21 @@ #endif #ifndef OPENSSL_NO_DSA + #include <assert.h> #include <stdio.h> #include <stdlib.h> -#include <time.h> #include <string.h> +#include <time.h> + #include "apps.h" + #include <openssl/bio.h> -#include <openssl/err.h> #include <openssl/bn.h> +#include <openssl/err.h> #include <openssl/dsa.h> -#include <openssl/x509.h> #include <openssl/pem.h> - +#include <openssl/x509.h> /* -inform arg - input format - default PEM (DER or PEM) * -outform arg - output format - default PEM diff --git a/lib/libssl/src/apps/ec.c b/lib/libssl/src/apps/ec.c index 3f4a1d00455..6bd71c333ae 100644 --- a/lib/libssl/src/apps/ec.c +++ b/lib/libssl/src/apps/ec.c @@ -57,17 +57,20 @@ */ #include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_EC + #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" + #include <openssl/bio.h> #include <openssl/err.h> #include <openssl/evp.h> #include <openssl/pem.h> - /* -inform arg - input format - default PEM (one of DER, NET or PEM) * -outform arg - output format - default PEM * -in arg - input file - default stdin diff --git a/lib/libssl/src/apps/ecparam.c b/lib/libssl/src/apps/ecparam.c index 84ecba72f54..9d517eaf437 100644 --- a/lib/libssl/src/apps/ecparam.c +++ b/lib/libssl/src/apps/ecparam.c @@ -70,20 +70,23 @@ */ #include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_EC + #include <assert.h> #include <stdio.h> #include <stdlib.h> -#include <time.h> #include <string.h> +#include <time.h> + #include "apps.h" + #include <openssl/bio.h> -#include <openssl/err.h> #include <openssl/bn.h> #include <openssl/ec.h> -#include <openssl/x509.h> +#include <openssl/err.h> #include <openssl/pem.h> - +#include <openssl/x509.h> /* -inform arg - input format - default PEM (DER or PEM) * -outform arg - output format - default PEM diff --git a/lib/libssl/src/apps/enc.c b/lib/libssl/src/apps/enc.c index 0ac6a43f6a9..b31d10357f1 100644 --- a/lib/libssl/src/apps/enc.c +++ b/lib/libssl/src/apps/enc.c @@ -56,19 +56,21 @@ * [including the GNU Public Licence.] */ +#include <ctype.h> #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" + #include <openssl/bio.h> +#include <openssl/comp.h> #include <openssl/err.h> #include <openssl/evp.h> #include <openssl/objects.h> -#include <openssl/x509.h> -#include <openssl/rand.h> #include <openssl/pem.h> -#include <openssl/comp.h> -#include <ctype.h> +#include <openssl/rand.h> +#include <openssl/x509.h> int set_hex(char *in, unsigned char *out, int size); diff --git a/lib/libssl/src/apps/engine.c b/lib/libssl/src/apps/engine.c index 7b11ea57d9c..2cf7bd2412e 100644 --- a/lib/libssl/src/apps/engine.c +++ b/lib/libssl/src/apps/engine.c @@ -56,17 +56,17 @@ * */ - #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" -#include <openssl/err.h> + #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> +#include <openssl/err.h> #include <openssl/ssl.h> - static const char *engine_usage[] = { "usage: engine opts [engine ...]\n", " -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n", diff --git a/lib/libssl/src/apps/errstr.c b/lib/libssl/src/apps/errstr.c index 4605f098ab5..5c724285a09 100644 --- a/lib/libssl/src/apps/errstr.c +++ b/lib/libssl/src/apps/errstr.c @@ -59,13 +59,14 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" + #include <openssl/bio.h> -#include <openssl/lhash.h> #include <openssl/err.h> +#include <openssl/lhash.h> #include <openssl/ssl.h> - int errstr_main(int, char **); int diff --git a/lib/libssl/src/apps/gendh.c b/lib/libssl/src/apps/gendh.c index 4dd5c02a9eb..4fd47092dd2 100644 --- a/lib/libssl/src/apps/gendh.c +++ b/lib/libssl/src/apps/gendh.c @@ -58,6 +58,7 @@ */ #include <openssl/opensslconf.h> + /* Until the key-gen callbacks are modified to use newer prototypes, we allow * deprecated functions for openssl-internal code */ #ifdef OPENSSL_NO_DEPRECATED @@ -65,18 +66,22 @@ #endif #ifndef OPENSSL_NO_DH -#include <stdio.h> -#include <string.h> + #include <sys/types.h> #include <sys/stat.h> + +#include <stdio.h> +#include <string.h> + #include "apps.h" + #include <openssl/bio.h> -#include <openssl/rand.h> -#include <openssl/err.h> #include <openssl/bn.h> #include <openssl/dh.h> -#include <openssl/x509.h> +#include <openssl/err.h> #include <openssl/pem.h> +#include <openssl/rand.h> +#include <openssl/x509.h> #define DEFBITS 512 diff --git a/lib/libssl/src/apps/gendsa.c b/lib/libssl/src/apps/gendsa.c index df0993edb4c..cada26b45c1 100644 --- a/lib/libssl/src/apps/gendsa.c +++ b/lib/libssl/src/apps/gendsa.c @@ -56,19 +56,24 @@ * [including the GNU Public Licence.] */ -#include <openssl/opensslconf.h>/* for OPENSSL_NO_DSA */ +#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */ + #ifndef OPENSSL_NO_DSA -#include <stdio.h> -#include <string.h> + #include <sys/types.h> #include <sys/stat.h> + +#include <stdio.h> +#include <string.h> + #include "apps.h" + #include <openssl/bio.h> -#include <openssl/err.h> #include <openssl/bn.h> #include <openssl/dsa.h> -#include <openssl/x509.h> +#include <openssl/err.h> #include <openssl/pem.h> +#include <openssl/x509.h> #define DEFBITS 512 diff --git a/lib/libssl/src/apps/genpkey.c b/lib/libssl/src/apps/genpkey.c index 1b3bc57e7dd..5797de40573 100644 --- a/lib/libssl/src/apps/genpkey.c +++ b/lib/libssl/src/apps/genpkey.c @@ -55,12 +55,16 @@ * Hudson (tjh@cryptsoft.com). * */ + #include <stdio.h> #include <string.h> + #include "apps.h" -#include <openssl/pem.h> + #include <openssl/err.h> #include <openssl/evp.h> +#include <openssl/pem.h> + #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #endif diff --git a/lib/libssl/src/apps/genrsa.c b/lib/libssl/src/apps/genrsa.c index 7e5dd2b2397..96a678cbb83 100644 --- a/lib/libssl/src/apps/genrsa.c +++ b/lib/libssl/src/apps/genrsa.c @@ -57,6 +57,7 @@ */ #include <openssl/opensslconf.h> + /* Until the key-gen callbacks are modified to use newer prototypes, we allow * deprecated functions for openssl-internal code */ #ifdef OPENSSL_NO_DEPRECATED @@ -64,19 +65,23 @@ #endif #ifndef OPENSSL_NO_RSA -#include <stdio.h> -#include <string.h> + #include <sys/types.h> #include <sys/stat.h> + +#include <stdio.h> +#include <string.h> + #include "apps.h" + #include <openssl/bio.h> -#include <openssl/err.h> #include <openssl/bn.h> -#include <openssl/rsa.h> +#include <openssl/err.h> #include <openssl/evp.h> -#include <openssl/x509.h> #include <openssl/pem.h> #include <openssl/rand.h> +#include <openssl/rsa.h> +#include <openssl/x509.h> #define DEFBITS 2048 diff --git a/lib/libssl/src/apps/nseq.c b/lib/libssl/src/apps/nseq.c index 0a1512afcfb..d5271b1dcc4 100644 --- a/lib/libssl/src/apps/nseq.c +++ b/lib/libssl/src/apps/nseq.c @@ -58,10 +58,11 @@ #include <stdio.h> #include <string.h> + #include "apps.h" -#include <openssl/pem.h> -#include <openssl/err.h> +#include <openssl/err.h> +#include <openssl/pem.h> int nseq_main(int, char **); diff --git a/lib/libssl/src/apps/ocsp.c b/lib/libssl/src/apps/ocsp.c index 95778210db1..5e9e101bc5a 100644 --- a/lib/libssl/src/apps/ocsp.c +++ b/lib/libssl/src/apps/ocsp.c @@ -61,14 +61,16 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include "apps.h" /* needs to be included before the openssl - * headers! */ -#include <openssl/e_os2.h> + +/* Needs to be included before the openssl headers! */ +#include "apps.h" + +#include <openssl/bn.h> #include <openssl/crypto.h> +#include <openssl/e_os2.h> #include <openssl/err.h> -#include <openssl/ssl.h> #include <openssl/evp.h> -#include <openssl/bn.h> +#include <openssl/ssl.h> #include <openssl/x509v3.h> /* Maximum leeway in validity period: default 5 minutes */ diff --git a/lib/libssl/src/apps/openssl.c b/lib/libssl/src/apps/openssl.c index 2250701f68a..47428033cd6 100644 --- a/lib/libssl/src/apps/openssl.c +++ b/lib/libssl/src/apps/openssl.c @@ -113,21 +113,25 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> + #include "apps.h" + #include <openssl/bio.h> +#include <openssl/conf.h> #include <openssl/crypto.h> -#include <openssl/rand.h> +#include <openssl/err.h> #include <openssl/lhash.h> -#include <openssl/conf.h> -#include <openssl/x509.h> #include <openssl/pem.h> +#include <openssl/rand.h> #include <openssl/ssl.h> +#include <openssl/x509.h> + #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #endif + #include "progs.h" #include "s_apps.h" -#include <openssl/err.h> static void openssl_startup(void); static void openssl_shutdown(void); diff --git a/lib/libssl/src/apps/passwd.c b/lib/libssl/src/apps/passwd.c index 30a38aafb86..e87aed38e73 100644 --- a/lib/libssl/src/apps/passwd.c +++ b/lib/libssl/src/apps/passwd.c @@ -15,16 +15,15 @@ #include <openssl/err.h> #include <openssl/evp.h> #include <openssl/rand.h> + #ifndef OPENSSL_NO_DES #include <openssl/des.h> #endif + #ifndef NO_MD5CRYPT_1 #include <openssl/md5.h> #endif - - - static unsigned const char cov_2char[64] = { /* from crypto/des/fcrypt.c */ 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, diff --git a/lib/libssl/src/apps/pkcs12.c b/lib/libssl/src/apps/pkcs12.c index f23d902eb3c..aca248a50ab 100644 --- a/lib/libssl/src/apps/pkcs12.c +++ b/lib/libssl/src/apps/pkcs12.c @@ -57,21 +57,22 @@ */ #include <openssl/opensslconf.h> + #if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1) #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" + #include <openssl/crypto.h> #include <openssl/err.h> #include <openssl/pem.h> #include <openssl/pkcs12.h> - const EVP_CIPHER *enc; - #define NOKEYS 0x1 #define NOCERTS 0x2 #define INFO 0x4 diff --git a/lib/libssl/src/apps/pkcs7.c b/lib/libssl/src/apps/pkcs7.c index 8540a3f6c2f..57e611f9ee1 100644 --- a/lib/libssl/src/apps/pkcs7.c +++ b/lib/libssl/src/apps/pkcs7.c @@ -60,14 +60,15 @@ #include <stdlib.h> #include <string.h> #include <time.h> + #include "apps.h" + #include <openssl/err.h> -#include <openssl/objects.h> #include <openssl/evp.h> -#include <openssl/x509.h> -#include <openssl/pkcs7.h> +#include <openssl/objects.h> #include <openssl/pem.h> - +#include <openssl/pkcs7.h> +#include <openssl/x509.h> /* -inform arg - input format - default PEM (DER or PEM) * -outform arg - output format - default PEM diff --git a/lib/libssl/src/apps/pkcs8.c b/lib/libssl/src/apps/pkcs8.c index ee6a48fc140..1f1a11e4552 100644 --- a/lib/libssl/src/apps/pkcs8.c +++ b/lib/libssl/src/apps/pkcs8.c @@ -55,15 +55,17 @@ * Hudson (tjh@cryptsoft.com). * */ + #include <stdio.h> #include <string.h> + #include "apps.h" -#include <openssl/pem.h> + #include <openssl/err.h> #include <openssl/evp.h> +#include <openssl/pem.h> #include <openssl/pkcs12.h> - int pkcs8_main(int, char **); int diff --git a/lib/libssl/src/apps/pkey.c b/lib/libssl/src/apps/pkey.c index 627278fabc5..101ba5b2399 100644 --- a/lib/libssl/src/apps/pkey.c +++ b/lib/libssl/src/apps/pkey.c @@ -55,13 +55,15 @@ * Hudson (tjh@cryptsoft.com). * */ + #include <stdio.h> #include <string.h> + #include "apps.h" -#include <openssl/pem.h> + #include <openssl/err.h> #include <openssl/evp.h> - +#include <openssl/pem.h> int pkey_main(int, char **); diff --git a/lib/libssl/src/apps/pkeyparam.c b/lib/libssl/src/apps/pkeyparam.c index caeaf193df6..d12ac0b86bf 100644 --- a/lib/libssl/src/apps/pkeyparam.c +++ b/lib/libssl/src/apps/pkeyparam.c @@ -55,13 +55,15 @@ * Hudson (tjh@cryptsoft.com). * */ + #include <stdio.h> #include <string.h> + #include "apps.h" -#include <openssl/pem.h> + #include <openssl/err.h> #include <openssl/evp.h> - +#include <openssl/pem.h> int pkeyparam_main(int, char **); diff --git a/lib/libssl/src/apps/pkeyutl.c b/lib/libssl/src/apps/pkeyutl.c index c112c773b91..46392e6902e 100644 --- a/lib/libssl/src/apps/pkeyutl.c +++ b/lib/libssl/src/apps/pkeyutl.c @@ -55,12 +55,13 @@ * */ +#include <string.h> #include "apps.h" -#include <string.h> + #include <openssl/err.h> -#include <openssl/pem.h> #include <openssl/evp.h> +#include <openssl/pem.h> #define KEY_PRIVKEY 1 #define KEY_PUBKEY 2 @@ -68,8 +69,6 @@ static void usage(void); - - static EVP_PKEY_CTX *init_ctx(int *pkeysize, char *keyfile, int keyform, int key_type, char *passargin, int pkey_op, ENGINE * e); diff --git a/lib/libssl/src/apps/prime.c b/lib/libssl/src/apps/prime.c index c6f562a7e3a..de8f232851b 100644 --- a/lib/libssl/src/apps/prime.c +++ b/lib/libssl/src/apps/prime.c @@ -50,9 +50,8 @@ #include <string.h> #include "apps.h" -#include <openssl/bn.h> - +#include <openssl/bn.h> int prime_main(int, char **); diff --git a/lib/libssl/src/apps/rand.c b/lib/libssl/src/apps/rand.c index 355a42e184a..c543e326b23 100644 --- a/lib/libssl/src/apps/rand.c +++ b/lib/libssl/src/apps/rand.c @@ -53,17 +53,16 @@ * */ -#include "apps.h" - #include <ctype.h> #include <stdio.h> #include <string.h> +#include "apps.h" + #include <openssl/bio.h> #include <openssl/err.h> #include <openssl/rand.h> - /* -out file - write to file * -rand file:file - PRNG seed files * -base64 - base64 encode output diff --git a/lib/libssl/src/apps/req.c b/lib/libssl/src/apps/req.c index 26a3e1196cc..21ddb3b9c3e 100644 --- a/lib/libssl/src/apps/req.c +++ b/lib/libssl/src/apps/req.c @@ -64,26 +64,30 @@ #include <stdio.h> #include <stdlib.h> -#include <time.h> #include <string.h> +#include <time.h> + #include "apps.h" + +#include <openssl/asn1.h> #include <openssl/bio.h> -#include <openssl/evp.h> +#include <openssl/bn.h> #include <openssl/conf.h> #include <openssl/err.h> -#include <openssl/asn1.h> -#include <openssl/x509.h> -#include <openssl/x509v3.h> +#include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/pem.h> -#include <openssl/bn.h> -#ifndef OPENSSL_NO_RSA -#include <openssl/rsa.h> -#endif +#include <openssl/x509.h> +#include <openssl/x509v3.h> + #ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> #endif +#ifndef OPENSSL_NO_RSA +#include <openssl/rsa.h> +#endif + #define SECTION "req" #define BITS "default_bits" diff --git a/lib/libssl/src/apps/rsa.c b/lib/libssl/src/apps/rsa.c index 3e0b2ebfac2..0b9c87dd998 100644 --- a/lib/libssl/src/apps/rsa.c +++ b/lib/libssl/src/apps/rsa.c @@ -57,20 +57,23 @@ */ #include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_RSA + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> + #include "apps.h" + #include <openssl/bio.h> +#include <openssl/bn.h> #include <openssl/err.h> -#include <openssl/rsa.h> #include <openssl/evp.h> -#include <openssl/x509.h> #include <openssl/pem.h> -#include <openssl/bn.h> - +#include <openssl/rsa.h> +#include <openssl/x509.h> /* -inform arg - input format - default PEM (one of DER, NET or PEM) * -outform arg - output format - default PEM diff --git a/lib/libssl/src/apps/rsautl.c b/lib/libssl/src/apps/rsautl.c index 04992ae609b..55c89b271bb 100644 --- a/lib/libssl/src/apps/rsautl.c +++ b/lib/libssl/src/apps/rsautl.c @@ -57,10 +57,13 @@ */ #include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_RSA -#include "apps.h" #include <string.h> + +#include "apps.h" + #include <openssl/err.h> #include <openssl/pem.h> #include <openssl/rsa.h> @@ -76,8 +79,6 @@ static void usage(void); - - int rsautl_main(int argc, char **); int diff --git a/lib/libssl/src/apps/s_cb.c b/lib/libssl/src/apps/s_cb.c index 9da5825f05d..977dd75c5f1 100644 --- a/lib/libssl/src/apps/s_cb.c +++ b/lib/libssl/src/apps/s_cb.c @@ -109,18 +109,22 @@ * */ +#include <sys/socket.h> + +#include <netinet/in.h> + +#include <netdb.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <netdb.h> -#include <sys/socket.h> -#include <netinet/in.h> #include "apps.h" + #include <openssl/err.h> #include <openssl/rand.h> -#include <openssl/x509.h> #include <openssl/ssl.h> +#include <openssl/x509.h> + #include "s_apps.h" #define COOKIE_SECRET_LENGTH 16 diff --git a/lib/libssl/src/apps/s_client.c b/lib/libssl/src/apps/s_client.c index 7549c980e09..d29f14709a0 100644 --- a/lib/libssl/src/apps/s_client.c +++ b/lib/libssl/src/apps/s_client.c @@ -137,33 +137,33 @@ #include <sys/types.h> #include <sys/ioctl.h> +#include <sys/socket.h> #include <netinet/in.h> + #include <assert.h> #include <ctype.h> +#include <limits.h> +#include <netdb.h> #include <stdio.h> #include <stdlib.h> -#include <limits.h> #include <string.h> #include <unistd.h> -#include <openssl/e_os2.h> -#include <netdb.h> -#include <sys/socket.h> -#include <netinet/in.h> #include "apps.h" -#include <openssl/x509.h> -#include <openssl/ssl.h> + +#include <openssl/bn.h> +#include <openssl/e_os2.h> #include <openssl/err.h> +#include <openssl/ocsp.h> #include <openssl/pem.h> #include <openssl/rand.h> -#include <openssl/ocsp.h> -#include <openssl/bn.h> +#include <openssl/ssl.h> +#include <openssl/x509.h> + #include "s_apps.h" #include "timeouts.h" - - /*#define SSL_HOST_NAME "www.netscape.com" */ /*#define SSL_HOST_NAME "193.118.187.102" */ #define SSL_HOST_NAME "localhost" diff --git a/lib/libssl/src/apps/s_server.c b/lib/libssl/src/apps/s_server.c index 67886bbb586..333e09f3cab 100644 --- a/lib/libssl/src/apps/s_server.c +++ b/lib/libssl/src/apps/s_server.c @@ -146,7 +146,9 @@ #undef OPENSSL_NO_DEPRECATED #endif +#include <sys/types.h> #include <sys/ioctl.h> +#include <sys/socket.h> #include <assert.h> #include <ctype.h> @@ -154,31 +156,30 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <sys/socket.h> -#include <openssl/e_os2.h> - -#include <sys/types.h> +#include "apps.h" -#include <openssl/lhash.h> #include <openssl/bn.h> -#include "apps.h" +#include <openssl/e_os2.h> #include <openssl/err.h> +#include <openssl/lhash.h> +#include <openssl/ocsp.h> #include <openssl/pem.h> -#include <openssl/x509.h> -#include <openssl/ssl.h> #include <openssl/rand.h> -#include <openssl/ocsp.h> +#include <openssl/ssl.h> +#include <openssl/x509.h> + #ifndef OPENSSL_NO_DH #include <openssl/dh.h> #endif + #ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> #endif + #include "s_apps.h" #include "timeouts.h" - #ifndef OPENSSL_NO_RSA static RSA *tmp_rsa_cb(SSL * s, int is_export, int keylength); #endif diff --git a/lib/libssl/src/apps/s_socket.c b/lib/libssl/src/apps/s_socket.c index 919ab40cd5b..a9bbe97ddf5 100644 --- a/lib/libssl/src/apps/s_socket.c +++ b/lib/libssl/src/apps/s_socket.c @@ -56,23 +56,24 @@ * [including the GNU Public Licence.] */ +#include <sys/socket.h> + +#include <netinet/in.h> + +#include <errno.h> +#include <netdb.h> +#include <signal.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <errno.h> -#include <signal.h> -#include <netdb.h> #include <unistd.h> -#include <sys/socket.h> -#include <netinet/in.h> - -#include <openssl/e_os2.h> #include "apps.h" -#include "s_apps.h" -#include <openssl/ssl.h> +#include <openssl/e_os2.h> +#include <openssl/ssl.h> +#include "s_apps.h" static int ssl_sock_init(void); static int init_server(int *sock, int port, int type); @@ -81,7 +82,6 @@ static int do_accept(int acc_sock, int *sock, char **host); #define SOCKET_PROTOCOL IPPROTO_TCP - static int ssl_sock_init(void) { diff --git a/lib/libssl/src/apps/s_time.c b/lib/libssl/src/apps/s_time.c index 4cf62ffea62..e242037cc81 100644 --- a/lib/libssl/src/apps/s_time.c +++ b/lib/libssl/src/apps/s_time.c @@ -63,19 +63,21 @@ Written and donated by Larry Streepy <streepy@healthcare.com> -----------------------------------------*/ +#include <sys/socket.h> + #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/socket.h> +#include <unistd.h> #include "apps.h" -#include <openssl/x509.h> -#include <openssl/ssl.h> -#include <openssl/pem.h> -#include "s_apps.h" + #include <openssl/err.h> -#include <unistd.h> +#include <openssl/pem.h> +#include <openssl/ssl.h> +#include <openssl/x509.h> +#include "s_apps.h" #define SSL_CONNECT_NAME "localhost:4433" diff --git a/lib/libssl/src/apps/sess_id.c b/lib/libssl/src/apps/sess_id.c index 49766fdb650..f255f25f1b4 100644 --- a/lib/libssl/src/apps/sess_id.c +++ b/lib/libssl/src/apps/sess_id.c @@ -59,13 +59,14 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" + #include <openssl/bio.h> #include <openssl/err.h> -#include <openssl/x509.h> #include <openssl/pem.h> #include <openssl/ssl.h> - +#include <openssl/x509.h> static const char *sess_id_usage[] = { "usage: sess_id args\n", diff --git a/lib/libssl/src/apps/smime.c b/lib/libssl/src/apps/smime.c index f7d56b30055..78d783de469 100644 --- a/lib/libssl/src/apps/smime.c +++ b/lib/libssl/src/apps/smime.c @@ -60,10 +60,12 @@ #include <stdio.h> #include <string.h> + #include "apps.h" + #include <openssl/crypto.h> -#include <openssl/pem.h> #include <openssl/err.h> +#include <openssl/pem.h> #include <openssl/x509_vfy.h> #include <openssl/x509v3.h> diff --git a/lib/libssl/src/apps/speed.c b/lib/libssl/src/apps/speed.c index f96e9019171..6bcb943bffa 100644 --- a/lib/libssl/src/apps/speed.c +++ b/lib/libssl/src/apps/speed.c @@ -89,12 +89,14 @@ #include <string.h> #include <unistd.h> +#include "apps.h" + #include <openssl/bn.h> #include <openssl/crypto.h> #include <openssl/err.h> #include <openssl/evp.h> -#include <openssl/objects.h> #include <openssl/modes.h> +#include <openssl/objects.h> #include <openssl/rand.h> #include <openssl/x509.h> @@ -159,8 +161,6 @@ #include <openssl/whrlpool.h> #endif -#include "apps.h" - #ifndef OPENSSL_NO_DSA #include "./testdsa.h" #endif diff --git a/lib/libssl/src/apps/spkac.c b/lib/libssl/src/apps/spkac.c index 8fa21d98260..2fa7eac6b2b 100644 --- a/lib/libssl/src/apps/spkac.c +++ b/lib/libssl/src/apps/spkac.c @@ -57,19 +57,21 @@ * Hudson (tjh@cryptsoft.com). * */ + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> + #include "apps.h" + #include <openssl/bio.h> #include <openssl/conf.h> #include <openssl/err.h> #include <openssl/evp.h> #include <openssl/lhash.h> -#include <openssl/x509.h> #include <openssl/pem.h> - +#include <openssl/x509.h> /* -in arg - input file - default stdin * -out arg - output file - default stdout diff --git a/lib/libssl/src/apps/ts.c b/lib/libssl/src/apps/ts.c index c2d333cf7ec..2bb343d13c9 100644 --- a/lib/libssl/src/apps/ts.c +++ b/lib/libssl/src/apps/ts.c @@ -59,14 +59,15 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" + #include <openssl/bio.h> +#include <openssl/bn.h> #include <openssl/err.h> #include <openssl/pem.h> #include <openssl/rand.h> #include <openssl/ts.h> -#include <openssl/bn.h> - /* Length of the nonce of the request in bits (must be a multiple of 8). */ #define NONCE_LENGTH 64 diff --git a/lib/libssl/src/apps/verify.c b/lib/libssl/src/apps/verify.c index b73956bc578..b691460a9e5 100644 --- a/lib/libssl/src/apps/verify.c +++ b/lib/libssl/src/apps/verify.c @@ -59,13 +59,14 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" + #include <openssl/bio.h> #include <openssl/err.h> +#include <openssl/pem.h> #include <openssl/x509.h> #include <openssl/x509v3.h> -#include <openssl/pem.h> - static int cb(int ok, X509_STORE_CTX * ctx); static int check(X509_STORE * ctx, char *file, STACK_OF(X509) * uchain, diff --git a/lib/libssl/src/apps/version.c b/lib/libssl/src/apps/version.c index e7c58b5ae0b..cac5b6f145a 100644 --- a/lib/libssl/src/apps/version.c +++ b/lib/libssl/src/apps/version.c @@ -112,23 +112,28 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" -#include <openssl/evp.h> -#include <openssl/crypto.h> + #include <openssl/bn.h> -#ifndef OPENSSL_NO_RC4 -#include <openssl/rc4.h> +#include <openssl/crypto.h> +#include <openssl/evp.h> + +#ifndef OPENSSL_NO_BF +#include <openssl/blowfish.h> #endif + #ifndef OPENSSL_NO_DES #include <openssl/des.h> #endif + #ifndef OPENSSL_NO_IDEA #include <openssl/idea.h> #endif -#ifndef OPENSSL_NO_BF -#include <openssl/blowfish.h> -#endif +#ifndef OPENSSL_NO_RC4 +#include <openssl/rc4.h> +#endif int version_main(int, char **); diff --git a/lib/libssl/src/apps/x509.c b/lib/libssl/src/apps/x509.c index 389b752151b..a488623c418 100644 --- a/lib/libssl/src/apps/x509.c +++ b/lib/libssl/src/apps/x509.c @@ -60,23 +60,26 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "apps.h" -#include <openssl/bio.h> + #include <openssl/asn1.h> -#include <openssl/err.h> +#include <openssl/bio.h> #include <openssl/bn.h> +#include <openssl/err.h> #include <openssl/evp.h> -#include <openssl/x509.h> -#include <openssl/x509v3.h> #include <openssl/objects.h> #include <openssl/pem.h> -#ifndef OPENSSL_NO_RSA -#include <openssl/rsa.h> -#endif +#include <openssl/x509.h> +#include <openssl/x509v3.h> + #ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> #endif +#ifndef OPENSSL_NO_RSA +#include <openssl/rsa.h> +#endif #define POSTFIX ".srl" #define DEF_DAYS 30 |