Fix some warnings. Contributed by Anonymous.

diff --git a/Configure b/Configure
index 61101f380042ad4d472e9594e461975e6a7a1d49..72753f943a0d15043fa8a4b409a45b8b5438937d 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -83,6 +83,7 @@ my %table=(
 "purify",      "purify gcc:-g -DPURIFY -Wall:-lsocket -lnsl::::",
 "debug",       "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:-lefence::::",
 "debug-ben",   "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -Wall -Wshadow -Werror -pipe:::::",
+"debug-ben-strict",    "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe:::::",
 "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
 "dist",                "cc:-O -DNOPROTO::::",
 

diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c
index e04d327e416bae79262587aa57ba40a8f03516e3..6e0dd9562243ec55d0a921116dcbf7095aad6eb5 100644 (file)
--- a/crypto/asn1/asn_pack.c
+++ b/crypto/asn1/asn_pack.c
@@ -114,7 +114,9 @@ char *ASN1_unpack_string (oct, d2i)
 ASN1_STRING *oct;
 char *(*d2i)();
 {
-       unsigned char *p, *ret;
+       unsigned char *p;
+       char *ret;
+
        p = oct->data;
        if(!(ret = d2i(NULL, &p, oct->length)))
                ASN1err(ASN1_F_ASN1_UNPACK_STRING,ASN1_R_DECODE_ERROR);

diff --git a/crypto/evp/e_cbc_r2.c b/crypto/evp/e_cbc_r2.c
index 9175e53550891d6d0448d3d6251e54039f83bf0d..b15310ab4894c104c035a82e2e1dd8bf740cd5c1 100644 (file)
--- a/crypto/evp/e_cbc_r2.c
+++ b/crypto/evp/e_cbc_r2.c
@@ -192,7 +192,7 @@ int i;
                }
        }
 
-int rc2_get_asn1_type_and_iv(c,type)
+static int rc2_get_asn1_type_and_iv(c,type)
 EVP_CIPHER_CTX *c;
 ASN1_TYPE *type;
        {

diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
index d28e8860573fb293bee644923c0b4c6e0533c020..5dee184c7bd640029950dc0e6e588ea64ca29eb3 100644 (file)
--- a/crypto/pkcs12/p12_decr.c
+++ b/crypto/pkcs12/p12_decr.c
@@ -122,8 +122,10 @@ int passlen;
 ASN1_OCTET_STRING *oct;
 int seq;
 {
-       unsigned char *out, *p, *ret;
+       unsigned char *out, *p;
+       char *ret;
        int outlen;
+
        if (!PKCS12_pbe_crypt (algor, pass, passlen, oct->data, oct->length,
                                 &out, &outlen, 0)) {
                PKCS12err(PKCS12_F_PKCS12_DECRYPT_D2I,PKCS12_R_PKCS12_PBE_CRYPT_ERROR);

diff --git a/crypto/x509v3/v3_skey.c b/crypto/x509v3/v3_skey.c
index e725d6630c039334a3ed926cea52beb967324e5d..932cd8b26ce758240aaafff091e300e2da5a5b3e 100644 (file)
--- a/crypto/x509v3/v3_skey.c
+++ b/crypto/x509v3/v3_skey.c
@@ -115,7 +115,7 @@ char *str;
 
 }
 
-ASN1_OCTET_STRING *s2i_skey_id(method, ctx, str)
+static ASN1_OCTET_STRING *s2i_skey_id(method, ctx, str)
 X509V3_EXT_METHOD *method;
 X509V3_CTX *ctx;
 char *str;

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 66bd281d16cf01675a3c4abf911ca0626b22004d..1eb40c0606f5a6aa1dd4a22a62a0b948f32338a1 100644 (file)
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -251,7 +251,7 @@ int len;
 
        if (ret->cipher == NULL)
                {
-               char buf[5],*p;
+               unsigned char buf[5],*p;
                unsigned long l;
 
                p=buf;