generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update pkeyutl to use size_t for pkey functions.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2006-05-26 12:24:49 +00:00
parent 3cb9eb30d3
commit ba0d04a986
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/pkeyutl.c
View File

@ -80,8 +80,8 @@ static int setup_peer(BIO *err, EVP_PKEY_CTX *ctx, int peerform,
const char *file); const char *file);
static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op, static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
unsigned char *out, int *poutlen, unsigned char *out, size_t *poutlen,
unsigned char *in, int inlen); unsigned char *in, size_t inlen);
int MAIN(int argc, char **); int MAIN(int argc, char **);
@ -337,7 +337,7 @@ int MAIN(int argc, char **argv)
} }
else else
{ {
rv = do_keyop(ctx, pkey_op, NULL, &buf_outlen, rv = do_keyop(ctx, pkey_op, NULL, (size_t *)&buf_outlen,
buf_in, buf_inlen); buf_in, buf_inlen);
if (rv > 0) if (rv > 0)
{ {
@ -346,7 +346,7 @@ int MAIN(int argc, char **argv)
rv = -1; rv = -1;
else else
rv = do_keyop(ctx, pkey_op, rv = do_keyop(ctx, pkey_op,
buf_out, &buf_outlen, buf_out, (size_t *)&buf_outlen,
buf_in, buf_inlen); buf_in, buf_inlen);
} }
} }
@ -536,30 +536,30 @@ static int setup_peer(BIO *err, EVP_PKEY_CTX *ctx, int peerform,
} }
static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op, static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
unsigned char *out, int *poutlen, unsigned char *out, size_t *poutlen,
unsigned char *in, int inlen) unsigned char *in, size_t inlen)
{ {
int rv; int rv;
switch(pkey_op) switch(pkey_op)
{ {
case EVP_PKEY_OP_VERIFYRECOVER: case EVP_PKEY_OP_VERIFYRECOVER:
rv = EVP_PKEY_verify_recover(ctx, out, (unsigned int *)poutlen, in, inlen); rv = EVP_PKEY_verify_recover(ctx, out, poutlen, in, inlen);
break; break;
case EVP_PKEY_OP_SIGN: case EVP_PKEY_OP_SIGN:
rv = EVP_PKEY_sign(ctx, out, (unsigned int *)poutlen, in, inlen); rv = EVP_PKEY_sign(ctx, out, poutlen, in, inlen);
break; break;
case EVP_PKEY_OP_ENCRYPT: case EVP_PKEY_OP_ENCRYPT:
rv = EVP_PKEY_encrypt(ctx, out, (unsigned int *)poutlen, in, inlen); rv = EVP_PKEY_encrypt(ctx, out, poutlen, in, inlen);
break; break;
case EVP_PKEY_OP_DECRYPT: case EVP_PKEY_OP_DECRYPT:
rv = EVP_PKEY_decrypt(ctx, out, (unsigned int *)poutlen, in, inlen); rv = EVP_PKEY_decrypt(ctx, out, poutlen, in, inlen);
break; break;
case EVP_PKEY_OP_DERIVE: case EVP_PKEY_OP_DERIVE:
rv = EVP_PKEY_derive(ctx, out, (unsigned int *)poutlen); rv = EVP_PKEY_derive(ctx, out, poutlen);
break; break;
} }