summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2006-05-24 13:29:32 +0000
committerDr. Stephen Henson <steve@openssl.org>2006-05-24 13:29:32 +0000
commit0e3453536ec9ce09e4dd276c2fa4d62e362789e9 (patch)
tree38862e1ac0b36c186a5585ff2d20e66ede7265e9 /crypto
parenteaff5a1412011574860a74ff9076838ea1e59dd0 (diff)
Fix warnings.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/evp/p_sign.c2
-rw-r--r--crypto/pem/pem_info.c2
-rw-r--r--crypto/pem/pvkfmt.c2
-rw-r--r--crypto/pkcs7/pk7_doit.c4
-rw-r--r--crypto/pkcs7/pk7_lib.c2
-rw-r--r--crypto/pkcs7/pk7_smime.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c
index 54ad0fc7f7..8df6d48a7e 100644
--- 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 6e0ad72605..7382b61995 100644
--- 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 31ee365474..58a7f246ef 100644
--- 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 157cf193bd..a9fb081898 100644
--- 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 92d033fe02..21738eebe2 100644
--- 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 28ec531dca..d3b55e4273 100644
--- 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);