summaryrefslogtreecommitdiffstats
path: root/crypto/pem
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2005-09-05 07:04:40 +0000
committerRichard Levitte <levitte@openssl.org>2005-09-05 07:04:40 +0000
commit8a616a5a5fa12644c50a6e71e465280bea884b4a (patch)
treee971a68f34605d8eceab1b2987affaec29008d60 /crypto/pem
parent9455d430cb77b3cac175889247e9d5e844e61baa (diff)
Remove warnings about signed vs. unsigned...
Diffstat (limited to 'crypto/pem')
-rw-r--r--crypto/pem/pvkfmt.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c
index 0670442e91..31ee365474 100644
--- a/crypto/pem/pvkfmt.c
+++ b/crypto/pem/pvkfmt.c
@@ -742,7 +742,8 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in,
PEMerr(PEM_F_DO_PVK_BODY, ERR_R_MALLOC_FAILURE);
return NULL;
}
- if (!derive_pvk_key(keybuf, p, saltlen, psbuf, inlen))
+ if (!derive_pvk_key(keybuf, p, saltlen,
+ (unsigned char *)psbuf, inlen))
return NULL;
p += saltlen;
/* Copy BLOBHEADER across, decrypt rest */
@@ -893,7 +894,8 @@ static int i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel,
PEMerr(PEM_F_I2B_PVK,PEM_R_BAD_PASSWORD_READ);
goto error;
}
- if (!derive_pvk_key(keybuf, salt, PVK_SALTLEN, psbuf, inlen))
+ if (!derive_pvk_key(keybuf, salt, PVK_SALTLEN,
+ (unsigned char *)psbuf, inlen))
goto error;
if (enclevel == 1)
memset(keybuf + 5, 0, 11);