Fix warnings (note that gcc 4.2 has a bug that makes one of its

warnings hard to fix without major surgery).

diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c
index 176e93eabcc3e183c238de48d6139f6dbe7b19ee..975d004df4732d1eefa091cc64b76f1b2ef2a984 100644 (file)
--- a/crypto/evp/p5_crpt2.c
+++ b/crypto/evp/p5_crpt2.c
@@ -235,7 +235,7 @@ int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
        const unsigned char *pbuf;
        int saltlen, iter, plen;
        int rv = 0;
-       unsigned int keylen;
+       unsigned int keylen = 0;
        int prf_nid, hmac_md_nid;
        PBKDF2PARAM *kdf = NULL;
        const EVP_MD *prfmd;

diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c
index 65bb474213f237f2503fe7bb03d83b9b9f693f81..b11aea9f80ffba00143a915fe51a9d6050b0ecd6 100644 (file)
--- a/crypto/evp/p_sign.c
+++ b/crypto/evp/p_sign.c
@@ -80,8 +80,9 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
        {
        unsigned char m[EVP_MAX_MD_SIZE];
        unsigned int m_len;
-       int i,ok=0,v;
+       int i = 0,ok = 0,v;
        MS_STATIC EVP_MD_CTX tmp_ctx;
+       EVP_PKEY_CTX *pkctx = NULL;
 
        *siglen=0;
        EVP_MD_CTX_init(&tmp_ctx);
@@ -93,7 +94,6 @@ 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;
                size_t sltmp = (size_t)EVP_PKEY_size(pkey);
                i = 0;
                pkctx = EVP_PKEY_CTX_new(pkey, NULL);

diff --git a/crypto/evp/p_verify.c b/crypto/evp/p_verify.c
index 6e2e70b382075486b8dcd6f616289596b9dc1fd2..013825e347dd6541534b9798845037ce7945de39 100644 (file)
--- a/crypto/evp/p_verify.c
+++ b/crypto/evp/p_verify.c
@@ -67,8 +67,9 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
        {
        unsigned char m[EVP_MAX_MD_SIZE];
        unsigned int m_len;
-       int i,ok=0,v;
+       int i = 0,ok = 0,v;
        MS_STATIC EVP_MD_CTX tmp_ctx;
+       EVP_PKEY_CTX *pkctx = NULL;
 
        EVP_MD_CTX_init(&tmp_ctx);
        if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
@@ -79,7 +80,6 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
 
        if (ctx->digest->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)
                {
-               EVP_PKEY_CTX *pkctx = NULL;
                i = -1;
                pkctx = EVP_PKEY_CTX_new(pkey, NULL);
                if (!pkctx)