diff options
| author | Ben Laurie <ben@openssl.org> | 2010-02-28 14:22:56 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2010-02-28 14:22:56 +0000 |
| commit | 19ec2f4194cabf30f15ae2b7903d597ef38b024a (patch) | |
| tree | bbcc573a4f444b64fd26c4f7adfbdde6596d4b97 /crypto | |
| parent | 2b13f80360c321ce7cd336a286a057489bac9660 (diff) | |
Fix warnings (note that gcc 4.2 has a bug that makes one of its
warnings hard to fix without major surgery).
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/p5_crpt2.c | 2 | ||||
| -rw-r--r-- | crypto/evp/p_sign.c | 4 | ||||
| -rw-r--r-- | crypto/evp/p_verify.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index 176e93eabc..975d004df4 100644 --- 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 65bb474213..b11aea9f80 100644 --- 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 6e2e70b382..013825e347 100644 --- 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) |