Use correct pointer types for various functions.

diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index 31d44d944966ba530448bc8b795599d366bb7355..4621e765ffc93010c5932c5e39198d0d09d9f1d8 100644 (file)
--- 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 478ec0ec2f85f2b3d3192cac891f975aeec82c4a..095661805e0d98e47b04cf43522ca3efaadf1744 100644 (file)
--- 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 333d5675ac2036d24677c32586af7640a3f0a7c7..5887c4f233bd44f488f98e09d84233a8b5864c7b 100644 (file)
--- 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 b06863291083ebe860bf45c30662a172186335f5..51d8baf82e80e1d072a0d34fc7fad77822184d00 100644 (file)
--- 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 */;