From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 20 Jul 2006 16:56:47 +0000 (+0000)
Subject: Use correct pointer types for various functions.
X-Git-Tag: OpenSSL_0_9_8k^2~1186
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=786aa98da1e7921f240eedfb18e0370f0155c22b;p=oweals%2Fopenssl.git

Use correct pointer types for various functions.
---

diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index 31d44d9449..4621e765ff 100644
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c
@@ -120,7 +120,7 @@ static int pkey_ec_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
 					const unsigned char *tbs, size_t tbslen)
 	{
 	int ret, type;
-	size_t sltmp;
+	unsigned int sltmp;
 	EC_PKEY_CTX *dctx = ctx->data;
 	EC_KEY *ec = ctx->pkey->pkey.ec;
 
@@ -145,7 +145,7 @@ static int pkey_ec_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
 
 	if (ret < 0)
 		return ret;
-	*siglen = sltmp;
+	*siglen = (size_t)sltmp;
 	return 1;
 	}
 
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index 478ec0ec2f..095661805e 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -829,7 +829,7 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
 	EVP_PKEY_CTX *pctx;
 	unsigned char *abuf = NULL;
 	int alen;
-	unsigned int siglen;
+	size_t siglen;
 	const EVP_MD *md = NULL;
 
 	md = EVP_get_digestbyobj(si->digest_alg->algorithm);
diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c
index 333d5675ac..5887c4f233 100644
--- a/crypto/rsa/rsa_pmeth.c
+++ b/crypto/rsa/rsa_pmeth.c
@@ -245,7 +245,7 @@ static int pkey_rsa_verifyrecover(EVP_PKEY_CTX *ctx,
 			}
 		else if (rctx->pad_mode == RSA_PKCS1_PADDING)
 			{
-			unsigned int sltmp;
+			size_t sltmp;
 			ret = int_rsa_verify(EVP_MD_type(rctx->md),
 						NULL, 0, rout, &sltmp,
 					sig, siglen, ctx->pkey->pkey.rsa);
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index b068632910..51d8baf82e 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -189,7 +189,7 @@ struct X509_name_st
 #else
 	char *bytes;
 #endif
-	unsigned long hash; /* Keep the hash around for lookups */
+/*	unsigned long hash; Keep the hash around for lookups */
 	unsigned char *canon_enc;
 	int canon_enclen;
 	} /* X509_NAME */;