Use correct pointer types for various functions.
authorDr. Stephen Henson <steve@openssl.org>
Thu, 20 Jul 2006 16:56:47 +0000 (16:56 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 20 Jul 2006 16:56:47 +0000 (16:56 +0000)
crypto/ec/ec_pmeth.c
crypto/pkcs7/pk7_doit.c
crypto/rsa/rsa_pmeth.c
crypto/x509/x509.h

index 31d44d9..4621e76 100644 (file)
@@ -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;
        }
 
index 478ec0e..0956618 100644 (file)
@@ -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);
index 333d567..5887c4f 100644 (file)
@@ -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);
index b068632..51d8baf 100644 (file)
@@ -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 */;