Fix various things to let OpenSSL even pass ``egcc -pipe -O2 -Wall -Wshadow

-Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations
-Wnested-externs -Winline'' with EGCS 1.1.2+

diff --git a/CHANGES b/CHANGES
index 86cf1fadad025e6b434f82d160a37abc237db233..75acaceed3f5745516b30181543e89ad33b9df8f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,11 @@
 
  Changes between 0.9.2b and 0.9.3
 
+  *) Fix various things to let OpenSSL even pass ``egcc -pipe -O2 -Wall
+     -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes
+     -Wmissing-declarations -Wnested-externs -Winline'' with EGCS 1.1.2+ 
+     [Ralf S. Engelschall]
+
   *) Various fixes to the EVP and PKCS#7 code. It may now be able to
      handle PKCS#7 enveloped data properly.
      [Sebastian Akerman <sak@parallelconsulting.com>, modified by Steve]

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index ab600624d1e84a485245b1d288062c8f8d531912..e41c5677a86f824aceab171412c9e07df35c3098 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -78,6 +78,7 @@ EVP_CIPHER *enc;
 #define CACERTS                0x10
 
 int get_cert_chain(X509 *cert, STACK **chain);
+int dump_cert_text (BIO *out, X509 *x);
 int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen, int options);
 int dump_certs_pkeys_bags(BIO *out, STACK *bags, char *pass, int passlen, int options);
 int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass, int passlen, int options);

diff --git a/crypto/rsa/rsa_oaep_test.c b/crypto/rsa/rsa_oaep_test.c
index 998116a4e3d44933bd2aa45fb6c92afc909bbbf4..067f72640a7e7b0616864d345aa79e4462eb0027 100644 (file)
--- a/crypto/rsa/rsa_oaep_test.c
+++ b/crypto/rsa/rsa_oaep_test.c
@@ -25,7 +25,7 @@ int main(int argc, char *argv[])
   memcpy(c, ctext_ex, sizeof(ctext_ex) - 1); \
   return (sizeof(ctext_ex) - 1);
 
-int key1(RSA *key, unsigned char *c)
+static int key1(RSA *key, unsigned char *c)
     {
     unsigned char n[] =
 "\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F"
@@ -74,7 +74,7 @@ int key1(RSA *key, unsigned char *c)
     SetKey;
     }
 
-int key2(RSA *key, unsigned char *c)
+static int key2(RSA *key, unsigned char *c)
     {
     unsigned char n[] =
 "\x00\xA3\x07\x9A\x90\xDF\x0D\xFD\x72\xAC\x09\x0C\xCC\x2A\x78\xB8"
@@ -119,7 +119,7 @@ int key2(RSA *key, unsigned char *c)
     SetKey;
     }
 
-int key3(RSA *key, unsigned char *c)
+static int key3(RSA *key, unsigned char *c)
     {
     unsigned char n[] =
 "\x00\xBB\xF8\x2F\x09\x06\x82\xCE\x9C\x23\x38\xAC\x2B\x9D\xA8\x71"
@@ -191,7 +191,7 @@ int key3(RSA *key, unsigned char *c)
     SetKey;
     }
 
-int pad_unknown(void)
+static int pad_unknown(void)
 {
     unsigned long l;
     while ((l = ERR_get_error()) != 0)

diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_locl.h
index 03215c29106426e38f0838f6114594d5582371e9..a88a019ff3131cf4d9982b0eb0669ed9a058d38e 100644 (file)
--- a/crypto/sha/sha_locl.h
+++ b/crypto/sha/sha_locl.h
@@ -178,10 +178,10 @@
                        })
 #ifndef I386_ONLY
 #define Endian_Reverse32(a) \
-                       { register unsigned int l=(a);  \
+                       { register unsigned int ltmp=(a);       \
                                asm ("bswapl %0"        \
-                               : "=r"(l) : "0"(l));    \
-                         (a)=l;                        \
+                               : "=r"(ltmp) : "0"(ltmp));      \
+                         (a)=ltmp;                     \
                        }
 #endif
 #elif defined(__powerpc)

diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index ac95f8a1393b0265c30592e3e65be79e8e676d79..0402ae769cbc61393b4876da17ed7f4fec889acc 100644 (file)
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -900,6 +900,9 @@ PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken);
 
 /* Password based encryption routines */
 
+int EVP_PBE_CipherInit (ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
+            unsigned char *salt, int saltlen, int iter, EVP_CIPHER_CTX *ctx,
+            int en_de);
 int EVP_PBE_ALGOR_CipherInit(X509_ALGOR *algor, const char *pass,
                             int passlen, EVP_CIPHER_CTX *ctx, int en_de);
 int EVP_PBE_alg_add(int nid, EVP_CIPHER *cipher, EVP_MD *md,

diff --git a/crypto/x509v3/v3_enum.c b/crypto/x509v3/v3_enum.c
index e76229da76782fa26ad4f04090b1759788b061ff..05af992f6d8e7936bee6aad7743b0dd931c75a45 100644 (file)
--- a/crypto/x509v3/v3_enum.c
+++ b/crypto/x509v3/v3_enum.c
@@ -60,7 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/x509v3.h>
 
-static ASN1_ENUMERATED *asn1_enumerated_new();
+static ASN1_ENUMERATED *asn1_enumerated_new(void);
 
 static ENUMERATED_NAMES crl_reasons[] = {
 {0, "Unspecified", "unspecified"},

diff --git a/crypto/x509v3/v3_int.c b/crypto/x509v3/v3_int.c
index 33239dd6c09db8fd8493c84c478e1cbc041190ba..b27c0f4cc204a0dbda3c219f14e1817c7211cdde 100644 (file)
--- a/crypto/x509v3/v3_int.c
+++ b/crypto/x509v3/v3_int.c
@@ -60,7 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/x509v3.h>
 
-static ASN1_INTEGER *asn1_integer_new();
+static ASN1_INTEGER *asn1_integer_new(void);
 
 X509V3_EXT_METHOD v3_crl_num = { 
 NID_crl_number, 0,

diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index d294a3cff1b97b46fd114b69ff611d37da1ab7a1..f80dc74682c585e999a7ea1321ceed7c880a7363 100644 (file)
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -381,6 +381,7 @@ X509_EXTENSION *X509V3_EXT_conf_nid(LHASH *conf, X509V3_CTX *ctx, int ext_nid, c
 X509_EXTENSION *X509V3_EXT_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value);
 int X509V3_EXT_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, X509 *cert);
 int X509V3_EXT_CRL_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, X509_CRL *crl);
+int X509V3_add_value_bool_nf(char *name, int asn1_bool, STACK **extlist);
 int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool);
 int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint);
 void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH *lhash);
@@ -403,6 +404,7 @@ ASN1_INTEGER * s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, char *value);
 char * i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint);
 char * i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint);
 int X509V3_EXT_add(X509V3_EXT_METHOD *ext);
+int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist);
 int X509V3_EXT_add_alias(int nid_to, int nid_from);
 void X509V3_EXT_cleanup(void);
 
@@ -417,6 +419,7 @@ char *hex_to_string(unsigned char *buffer, long len);
 unsigned char *string_to_hex(char *str, long *len);
 int name_cmp(const char *name, const char *cmp);
 
+void X509V3_EXT_val_prn(BIO *out, STACK *val, int indent, int ml);
 int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent);
 int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);