projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New functions to retrieve certificate signatures and signature OID NID.
[oweals/openssl.git]
/
crypto
/
pem
/
pvkfmt.c
diff --git
a/crypto/pem/pvkfmt.c
b/crypto/pem/pvkfmt.c
index 0dd6f5d98a6a3dc7f8049f1642195b8d6c598755..b1bf71a5daad4ce62e8365d167bde8ad5a4f37d0 100644
(file)
--- a/
crypto/pem/pvkfmt.c
+++ b/
crypto/pem/pvkfmt.c
@@
-662,7
+662,7
@@
static int do_PVK_header(const unsigned char **in, unsigned int length,
{
const unsigned char *p = *in;
{
const unsigned char *p = *in;
- unsigned int pvk_magic,
keytype,
is_encrypted;
+ unsigned int pvk_magic, is_encrypted;
if (skip_magic)
{
if (length < 20)
if (skip_magic)
{
if (length < 20)
@@
-689,7
+689,7
@@
static int do_PVK_header(const unsigned char **in, unsigned int length,
}
/* Skip reserved */
p += 4;
}
/* Skip reserved */
p += 4;
-
keytype =
read_ledword(&p);
+
/*keytype = */
read_ledword(&p);
is_encrypted = read_ledword(&p);
*psaltlen = read_ledword(&p);
*pkeylen = read_ledword(&p);
is_encrypted = read_ledword(&p);
*psaltlen = read_ledword(&p);
*pkeylen = read_ledword(&p);
@@
-847,7
+847,7
@@
EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u)
static int i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel,
pem_password_cb *cb, void *u)
{
static int i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel,
pem_password_cb *cb, void *u)
{
- int outlen = 24,
noinc,
pklen;
+ int outlen = 24, pklen;
unsigned char *p, *salt = NULL;
EVP_CIPHER_CTX cctx;
EVP_CIPHER_CTX_init(&cctx);
unsigned char *p, *salt = NULL;
EVP_CIPHER_CTX cctx;
EVP_CIPHER_CTX_init(&cctx);
@@
-860,10
+860,7
@@
static int i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel,
if (!out)
return outlen;
if (*out)
if (!out)
return outlen;
if (*out)
- {
p = *out;
p = *out;
- noinc = 0;
- }
else
{
p = OPENSSL_malloc(outlen);
else
{
p = OPENSSL_malloc(outlen);
@@
-873,7
+870,6
@@
static int i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel,
return -1;
}
*out = p;
return -1;
}
*out = p;
- noinc = 1;
}
write_ledword(&p, MS_PVKMAGIC);
}
write_ledword(&p, MS_PVKMAGIC);