Fix warnings.

diff --git a/Configure b/Configure
index a2dc83921e1a385523853103ad92cdbc50392a18..252e7dbe2744aab5bfe48ddc34f0038f3a729fa1 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -156,6 +156,7 @@ my %table=(
 "debug-bodo",  "gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -march=i486 -pedantic -Wshadow -Wall::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
 "debug-ulf", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll",
 "debug-steve", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -march=i486 -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared",
+"debug-steve-opt",     "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -march=i486 -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe -O3::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared",
 "debug-steve-linux-pseudo64",  "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DOPENSSL_NO_ASM -g -mcpu=i486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:SIXTY_FOUR_BIT:${no_asm}:dlfcn:linux-shared",
 "debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c
index 54ad0fc7f74da3b06eff08887647b06541099a99..8df6d48a7ec0892d554d89839fa17039eb119793 100644 (file)
--- a/crypto/evp/p_sign.c
+++ b/crypto/evp/p_sign.c
@@ -92,7 +92,7 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
        if (ctx->digest->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)
                {
                EVP_PKEY_CTX *pkctx = NULL;
-               int sltmp = EVP_PKEY_size(pkey);
+               size_t sltmp = (size_t)EVP_PKEY_size(pkey);
                i = 0;
                pkctx = EVP_PKEY_CTX_new(pkey, NULL);
                if (!pkctx)

diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c
index 6e0ad72605fb42097f65b9d48de2770d68843469..7382b61995c4a3a2c570448461559d78227b1ac3 100644 (file)
--- a/crypto/pem/pem_info.c
+++ b/crypto/pem/pem_info.c
@@ -99,7 +99,7 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pe
        int ok=0;
        STACK_OF(X509_INFO) *ret=NULL;
        unsigned int i,raw,ptype;
-       d2i_of_void *d2i;
+       d2i_of_void *d2i = 0;
 
        if (sk == NULL)
                {

diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c
index 31ee3654745ce95f2346f393d25dccdd257118af..58a7f246ef97391bcc6741e122fd62605cdff21c 100644 (file)
--- a/crypto/pem/pvkfmt.c
+++ b/crypto/pem/pvkfmt.c
@@ -480,7 +480,7 @@ static void write_dsa(unsigned char **out, DSA *dsa, int ispub);
 static int do_i2b(unsigned char **out, EVP_PKEY *pk, int ispub)
        {
        unsigned char *p;
-       unsigned int bitlen, magic, keyalg;
+       unsigned int bitlen, magic = 0, keyalg;
        int outlen, noinc = 0;
        if (pk->type == EVP_PKEY_DSA)
                {

diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index 157cf193bd8d0f29167cea5c34622a0407bf60ef..a9fb08189802e7fda12a3297efb9680c968be788 100644 (file)
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -145,7 +145,7 @@ static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
        EVP_PKEY *pkey = NULL;
        unsigned char *ek = NULL;
        int ret = 0;
-       int eklen;
+       size_t eklen;
 
        pkey = X509_get_pubkey(ri->cert);
 
@@ -202,7 +202,7 @@ int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
        {
        EVP_PKEY_CTX *pctx = NULL;
        unsigned char *ek = NULL;
-       int eklen;
+       size_t eklen;
 
        int ret = 0;
 

diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index 92d033fe0269b5e449814837cc110d1721b9fa47..21738eebe23065b2eb7dec8a4cc06243c16c1fc5 100644 (file)
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -388,7 +388,7 @@ err:
 PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey,
             const EVP_MD *dgst)
        {
-       PKCS7_SIGNER_INFO *si;
+       PKCS7_SIGNER_INFO *si = NULL;
 
        if (dgst == NULL)
                {

diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
index 28ec531dca5d6119d3aadd91ea9fda5850ddf5ad..d3b55e427387ffacc022ad4dbe5ef1e999567353 100644 (file)
--- a/crypto/pkcs7/pk7_smime.c
+++ b/crypto/pkcs7/pk7_smime.c
@@ -112,7 +112,7 @@ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
 int PKCS7_final(PKCS7 *p7, BIO *data, int flags)
        {
        BIO *p7bio;
-       int ret;
+       int ret = 0;
        if (!(p7bio = PKCS7_dataInit(p7, NULL)))
                {
                PKCS7err(PKCS7_F_PKCS7_FINAL,ERR_R_MALLOC_FAILURE);