Make gcc 2.95.2 happy again, even under ``-Wall -Wshadow -Wpointer-arith -Wcast-align

-Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline''.

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index ac1e20dc04188dd0927d9846f22f786e66c6ae74..f104ebc1f08ae27078c4a98b501dcfefd6b7e239 100644 (file)
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -80,6 +80,8 @@
 #undef PROG
 #define PROG   asn1parse_main
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int i,badops=0,offset=0,ret=1,j;

diff --git a/apps/ca.c b/apps/ca.c
index 8696b4157147ef54794fa49e09bfeb8d90f4e842..6a27a6de158702fdfb236fbe763792bf80a5844d 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -213,6 +213,8 @@ static char *section=NULL;
 static int preserve=0;
 static int msie_hack=0;
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        char *key=NULL;

diff --git a/apps/ciphers.c b/apps/ciphers.c
index 4baa0c3c8ebef8b7fe1e60adb167e9447fef3990..f8e9e7be2e6d5053f55edc49b990b2638a11e2c0 100644 (file)
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -77,6 +77,8 @@ static char *ciphers_usage[]={
 NULL
 };
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int ret=1,i;

diff --git a/apps/crl.c b/apps/crl.c
index d91eb7fd807ddad2cb1357c52cb98cc66528de49..338f46d97c5f00b95ab4d997f2df8e3527db1644 100644 (file)
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -93,6 +93,8 @@ NULL
 static X509_CRL *load_crl(char *file, int format);
 static BIO *bio_out=NULL;
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        X509_CRL *x=NULL;

diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 8514be2a4f3115e5bfdfbf266d15a3fb752d6b97..40565916769896f35ca44437cf85488786b75b31 100644 (file)
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -82,6 +82,8 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
  * -out arg    - output file - default stdout
  */
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int i,badops=0;

diff --git a/apps/dgst.c b/apps/dgst.c
index 5f0506ed8cd6b65c4ceb797dd4fee994dd64563c..1b56d6ef44167bbe1ac3c2a4f00bab2bf27cce98 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -74,6 +74,9 @@
 #define PROG   dgst_main
 
 void do_fp(unsigned char *buf,BIO *f,int sep);
+
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        unsigned char *buf=NULL;

diff --git a/apps/dh.c b/apps/dh.c
index becbdb6671a5ed0227e8f7ef06686247d10be4ec..b3c20e2b5c1dbdcdb88bef974c84794d65b2da90 100644 (file)
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -82,6 +82,8 @@
  * -C
  */
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        DH *dh=NULL;

diff --git a/apps/dhparam.c b/apps/dhparam.c
index 5b769b7f310253649a75e92f643c2384b7154db3..293a400d0c572f3e71831fdba1fd8d67004fb78b 100644 (file)
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -86,6 +86,8 @@
 
 static void MS_CALLBACK dh_cb(int p, int n, void *arg);
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        DH *dh=NULL;

diff --git a/apps/dsa.c b/apps/dsa.c
index 6198ea94eaed34f223bcfa3ab9acdaee3a725121..a94bc95058aca3185a3cb435ad54dbe2b1afde5d 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -83,6 +83,8 @@
  * -modulus    - print the DSA public key
  */
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int ret=1;

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 9fc5697c2e31ba807eccaacbbda01810bf50d924..4d4e1ad2b500826af400ae05d50029f7fd6ee6e8 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -85,6 +85,9 @@
  */
 
 static void MS_CALLBACK dsa_cb(int p, int n, void *arg);
+
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        DSA *dsa=NULL;

diff --git a/apps/enc.c b/apps/enc.c
index 0beb6377d7a873699cde067f85d01c326fa69a76..387cfe2f19a3900c6c8a8ad4dfeefa2d0033020a 100644 (file)
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -80,6 +80,8 @@ int set_hex(char *in,unsigned char *out,int size);
 #define BSIZE  (8*1024)
 #define        PROG    enc_main
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        static const char magic[]="Salted__";

diff --git a/apps/errstr.c b/apps/errstr.c
index c86b5d940bcac9e87482f1c5e7215c3b12028847..4650379589df24231421af31affce22e07b6d231 100644 (file)
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -68,6 +68,8 @@
 #undef PROG
 #define PROG   errstr_main
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int i,ret=0;

diff --git a/apps/gendh.c b/apps/gendh.c
index 39861175945630234f1485b46d3c5cbab64d86ef..1f6be9659968ac907678e2d6892cfb99b14ff706 100644 (file)
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -75,6 +75,9 @@
 #define PROG gendh_main
 
 static void MS_CALLBACK dh_cb(int p, int n, void *arg);
+
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        DH *dh=NULL;

diff --git a/apps/gendsa.c b/apps/gendsa.c
index 0c56b1410a5abb553f2f6afe7411494ddc15def2..805f11451659e3543404e115ab6afca90150a8f0 100644 (file)
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -73,6 +73,8 @@
 #undef PROG
 #define PROG gendsa_main
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        DSA *dsa=NULL;

diff --git a/apps/genrsa.c b/apps/genrsa.c
index 63fd45ee989ebb3062a33e73a34bbf256bafec9e..a20cd30092c3332b42fb02df6358e0a19c91e6e8 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -75,6 +75,9 @@
 #define PROG genrsa_main
 
 static void MS_CALLBACK genrsa_cb(int p, int n, void *arg);
+
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int ret=1;

diff --git a/apps/nseq.c b/apps/nseq.c
index 4a921396f9f75c1029eb16494f4bf237408f33d7..cc88d50ceba50ef82b1a0beb0f1c1cea23d855cc 100644 (file)
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -65,6 +65,7 @@
 #undef PROG
 #define PROG nseq_main
 
+int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index dd008c468ae0cfc31034c0aa6af812bd5ea66772..a54555b46778df6414914445d762d627d5a4c674 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -86,6 +86,9 @@ int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst, char *name);
 void hex_prin(BIO *out, unsigned char *buf, int len);
 int alg_print(BIO *x, X509_ALGOR *alg);
 int cert_load(BIO *in, STACK_OF(X509) *sk);
+
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
 {
     char *infile=NULL, *outfile=NULL, *keyname = NULL; 

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index d7feafd2f582e5efc6766b7842b27ae88db12593..f471cc77fda3c92e8e4802c6072db7afe666ddd7 100644 (file)
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -78,6 +78,8 @@
  * -print_certs
  */
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        PKCS7 *p7=NULL;

diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index cb55464f21c772c4325f0dfbe17ef53bbd7b95a0..e3fa7d4bad6d03681399785d902a3130770c1976 100644 (file)
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -66,6 +66,7 @@
 #include "apps.h"
 #define PROG pkcs8_main
 
+int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {

diff --git a/apps/req.c b/apps/req.c
index ce42611bfbc2ac832b026d7a42c30747391c8bd7..14e8ef5a4fdce902d4d33544d5c48fd9a02987ab 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -136,6 +136,8 @@ static LHASH *req_conf=NULL;
 #define TYPE_DSA       2
 #define TYPE_DH                3
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
 #ifndef NO_DSA

diff --git a/apps/rsa.c b/apps/rsa.c
index 1313ddc3e3fc25ba4faf5a6cf606af9a357d3b33..879b7ab5224c6177afd4606c1c414c8ce02f2eef 100644 (file)
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -86,6 +86,8 @@
  * -pubout     - Output a public key.
  */
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int ret=1;

diff --git a/apps/s_client.c b/apps/s_client.c
index fc3e398cb4fdd352da3577475bc602e939050d2c..ac19f4eed9b6f401cdb8133620d11a8085fbeeb1 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -153,6 +153,8 @@ static void sc_usage(void)
 
        }
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int off=0;

diff --git a/apps/s_server.c b/apps/s_server.c
index 044d4c448d2c4396503e20275b8a60450b763893..a92db5cd1bfdafcb894f28d63cd1cbccff0fc7b5 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -397,6 +397,8 @@ static int ebcdic_puts(BIO *bp, char *str)
 }
 #endif
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char *argv[])
        {
        short port=PORT;

diff --git a/apps/s_time.c b/apps/s_time.c
index 4f42681febdaa0389c22b4cfe65f26ee6bd5a244..39fd3b8b4d98d0d3111b27143ab4c807afeaf194 100644 (file)
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -388,6 +388,8 @@ static double tm_Time_F(int s)
  * MAIN - main processing area for client
  *                     real name depends on MONOLITH
  */
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        double totalTime = 0.0;

diff --git a/apps/sess_id.c b/apps/sess_id.c
index 3d363d13ebcffdba55a36691465195d557db5ae9..71d5aa0b7c6cde62d68759445f954d696df9716e 100644 (file)
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -84,6 +84,9 @@ NULL
 };
 
 static SSL_SESSION *load_sess_id(char *file, int format);
+
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        SSL_SESSION *x=NULL;

diff --git a/apps/smime.c b/apps/smime.c
index 95bda8388f562487f68806e32a29e577ed6a10dc..9c84841168b88532c4f04547e80f46e886ccb08b 100644 (file)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -80,6 +80,8 @@ static int save_certs(char *signerfile, STACK_OF(X509) *signers);
 #define SMIME_VERIFY   4
 #define SMIME_PK7OUT   5
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
 {
        int operation = 0;

diff --git a/apps/speed.c b/apps/speed.c
index c4fd79f884fe210e85b80dea5808ba0dae5ae296..b3130def8b928b0ea43d915eb39f8fe8ca58ae0c 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -238,6 +238,8 @@ static double Time_F(int s)
 #endif
        }
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        unsigned char *buf=NULL,*buf2=NULL;

diff --git a/apps/spkac.c b/apps/spkac.c
index e3f434d24c8661a47cdb4010541324c11d758a8e..e26a95d0fcef1953f2a44b261860fbf35228b1ca 100644 (file)
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -75,6 +75,8 @@
  * -out arg    - output file - default stdout
  */
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int i,badops=0, ret = 1;

diff --git a/apps/verify.c b/apps/verify.c
index a69c5d88f841fe4637138fc80c5dc038e77a6235..df596ca0422d42273a2d5a2820a2039345434743 100644 (file)
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -74,6 +74,8 @@ static int check(X509_STORE *ctx,char *file, STACK_OF(X509)*other, int purpose);
 static STACK_OF(X509) *load_untrusted(char *file);
 static int v_verbose=0;
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int i,ret=1;

diff --git a/apps/version.c b/apps/version.c
index a567f34094c5e91c5340930639723427aec5370a..f5c9adc25471c17e8f05ae54822c28ad15fb70e4 100644 (file)
--- a/apps/version.c
+++ b/apps/version.c
@@ -66,6 +66,8 @@
 #undef PROG
 #define PROG   version_main
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int i,ret=0;

diff --git a/apps/x509.c b/apps/x509.c
index 56e227160e0356cc9053593493e4c9430943a1d4..1e9072676adbb5905242990ca18fbd98b47ef040 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -141,6 +141,8 @@ static int x509_certify (X509_STORE *ctx,char *CAfile,const EVP_MD *digest,
 static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt);
 static int reqfile=0;
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int ret=1;

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index da41317fc9ce51cc70764413e0742dd75d0a3fbb..ad5ea3d17127bbc1f119a28f6e2351cf66746105 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -786,6 +786,7 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
 ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, 
                const unsigned char *in, int inlen, int inform, int nid);
 ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid);
+int ASN1_STRING_TABLE_add(int, long, long, unsigned long, unsigned long);
 void ASN1_STRING_TABLE_cleanup(void);
 
 /* BEGIN ERROR CODES */

diff --git a/crypto/bf/bf_enc.c b/crypto/bf/bf_enc.c
index a43361f4337e8db0081c02abfefb73b5a1c1dd38..b380acf9594004322e8f805959ea890cc5dae7b0 100644 (file)
--- a/crypto/bf/bf_enc.c
+++ b/crypto/bf/bf_enc.c
@@ -72,7 +72,8 @@ to modify the code.
 void BF_encrypt(BF_LONG *data, const BF_KEY *key)
        {
 #ifndef BF_PTR2
-       register BF_LONG l,r,*p,*s;
+       register BF_LONG l,r;
+    const register BF_LONG *p,*s;
 
        p=key->P;
        s= &(key->S[0]);
@@ -148,7 +149,8 @@ void BF_encrypt(BF_LONG *data, const BF_KEY *key)
 void BF_decrypt(BF_LONG *data, const BF_KEY *key)
        {
 #ifndef BF_PTR2
-       register BF_LONG l,r,*p,*s;
+       register BF_LONG l,r;
+    const register BF_LONG *p,*s;
 
        p=key->P;
        s= &(key->S[0]);

diff --git a/crypto/bf/bf_skey.c b/crypto/bf/bf_skey.c
index 4fb869b1298473ebfb1ec15d111ed89c1d782466..4d6a232fe0f4ab3a1218a3605dc82a8d8a3a6571 100644 (file)
--- a/crypto/bf/bf_skey.c
+++ b/crypto/bf/bf_skey.c
@@ -66,7 +66,7 @@ void BF_set_key(BF_KEY *key, int len, const unsigned char *data)
        {
        int i;
        BF_LONG *p,ri,in[2];
-       unsigned char *d,*end;
+       const unsigned char *d,*end;
 
 
        memcpy((char *)key,(char *)&bf_init,sizeof(BF_KEY));

diff --git a/crypto/bn/bntest.c b/crypto/bn/bntest.c
index cec21646da6a4ed32db6a9b028f075b957751917..9276a079d0e096ee09d40e1967510c8aa2b38da3 100644 (file)
--- a/crypto/bn/bntest.c
+++ b/crypto/bn/bntest.c
@@ -104,7 +104,7 @@ static unsigned char lst[]="\xC6\x4F\x43\x04\x2A\xEA\xCA\x6E\x58\x36\x80\x5B\xE8
 
 static const char rnd_seed[] = "string to make the random number generator think it has entropy";
 
-void message(BIO *out, char *m)
+static void message(BIO *out, char *m)
        {
        fprintf(stderr, "test %s\n", m);
 #if defined(linux) || defined(FreeBSD) /* can we use GNU bc features? */

diff --git a/crypto/crypto.h b/crypto/crypto.h
index f58ebc4a73091836f033b5282d5eede03bef4fbb..33a3c79d02ca32b2398a0604dbe1ee1482f55572 100644 (file)
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -310,7 +310,7 @@ void *CRYPTO_realloc(void *addr,int num, const char *file, int line);
 void *CRYPTO_remalloc(void *addr,int num, const char *file, int line);
 
 void CRYPTO_set_mem_debug_options(long bits);
-long CRYPTO_get_mem_debug_options();
+long CRYPTO_get_mem_debug_options(void);
 
 #define CRYPTO_push_info(info) \
         CRYPTO_push_info_(info, __FILE__, __LINE__);
@@ -336,7 +336,7 @@ void CRYPTO_dbg_free(void *addr,int before_p);
  * 3:  1 + 2
  */
 void CRYPTO_dbg_set_options(long bits);
-long CRYPTO_dbg_get_options();
+long CRYPTO_dbg_get_options(void);
 
 #ifndef NO_FP_API
 void CRYPTO_mem_leaks_fp(FILE *);
@@ -345,7 +345,7 @@ void CRYPTO_mem_leaks(struct bio_st *bio);
 /* unsigned long order, char *file, int line, int num_bytes, char *addr */
 void CRYPTO_mem_leaks_cb(void (*cb)());
 
-void ERR_load_CRYPTO_strings(void );
+void ERR_load_CRYPTO_strings(void);
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes

diff --git a/crypto/mem.c b/crypto/mem.c
index dac3d2685ca07ed8b124676269c31aa444abd06a..5a661e5f45ae4930d5eff2349e7a558d9275371f 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -253,7 +253,7 @@ void CRYPTO_set_mem_debug_options(long bits)
                set_debug_options_func(bits);
        }
 
-long CRYPTO_get_mem_debug_options()
+long CRYPTO_get_mem_debug_options(void)
        {
        if (get_debug_options_func != NULL)
                return get_debug_options_func();

diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index ad5297bc014cdddccfe30033c258d66c4941a112..14770c073377df6bc107b5ac89c197d38c89d286 100644 (file)
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -214,7 +214,7 @@ void CRYPTO_dbg_set_options(long bits)
        options = bits;
        }
 
-long CRYPTO_dbg_get_options()
+long CRYPTO_dbg_get_options(void)
        {
        return options;
        }

diff --git a/crypto/x509v3/v3_info.c b/crypto/x509v3/v3_info.c
index 6e3588aab813c8e544e3529eb6f905c3c5c4975a..78d2135046ec978574dfe6460e2d3e24c8afac17 100644 (file)
--- a/crypto/x509v3/v3_info.c
+++ b/crypto/x509v3/v3_info.c
@@ -207,7 +207,7 @@ void ACCESS_DESCRIPTION_free(ACCESS_DESCRIPTION *a)
        Free (a);
 }
 
-STACK_OF(ACCESS_DESCRIPTION) *AUTHORITY_INFO_ACCESS_new()
+STACK_OF(ACCESS_DESCRIPTION) *AUTHORITY_INFO_ACCESS_new(void)
 {
        return sk_ACCESS_DESCRIPTION_new(NULL);
 }

diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index 83998d0bc1e0845dc01e332398081dbf5421039b..a6d23921272f9840ce731a7bd2e9f1f3b7ded86c 100644 (file)
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -462,7 +462,7 @@ void ACCESS_DESCRIPTION_free(ACCESS_DESCRIPTION *a);
 ACCESS_DESCRIPTION *d2i_ACCESS_DESCRIPTION(ACCESS_DESCRIPTION **a, unsigned char **pp,
              long length);
 
-STACK_OF(ACCESS_DESCRIPTION) *AUTHORITY_INFO_ACCESS_new();
+STACK_OF(ACCESS_DESCRIPTION) *AUTHORITY_INFO_ACCESS_new(void);
 void AUTHORITY_INFO_ACCESS_free(STACK_OF(ACCESS_DESCRIPTION) *a);
 STACK_OF(ACCESS_DESCRIPTION) *d2i_AUTHORITY_INFO_ACCESS(STACK_OF(ACCESS_DESCRIPTION) **a,
                                         unsigned char **pp, long length);