oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

less printf and memory leaks

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16442 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-01-03 09:52:56 +00:00
parent ecfef14d45
commit b34cfe9fe8
1 changed files with 60 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
lib/hx509/ks_p12.c
View File

@@ -62,7 +62,7 @@ struct type {
collector_func func; collector_func func;
}; };
static int static void
parse_pkcs12_type(struct collector *, const heim_oid *, parse_pkcs12_type(struct collector *, const heim_oid *,
const void *, size_t, const PKCS12_Attributes *); const void *, size_t, const PKCS12_Attributes *);
@@ -90,37 +90,29 @@ ShroudedKeyBag_parser(struct collector *c, const void *data, size_t length,
heim_octet_string content; heim_octet_string content;
int ret; int ret;
printf("pkcs8ShroudedKeyBag\n");
memset(&pk, 0, sizeof(pk)); memset(&pk, 0, sizeof(pk));
attr = find_attribute(attrs, oid_id_pkcs_9_at_localKeyId()); attr = find_attribute(attrs, oid_id_pkcs_9_at_localKeyId());
if (attr == NULL) { if (attr == NULL)
printf("no localKeyId, ignoreing private key\n");
return 0; return 0;
}
ret = decode_PKCS8EncryptedPrivateKeyInfo(data, length, &pk, NULL); ret = decode_PKCS8EncryptedPrivateKeyInfo(data, length, &pk, NULL);
if (ret) { if (ret)
printf("PKCS8EncryptedPrivateKeyInfo returned %d\n", ret);
return ret; return ret;
}
ret = _hx509_pbe_decrypt(c->lock, ret = _hx509_pbe_decrypt(c->lock,
&pk.encryptionAlgorithm, &pk.encryptionAlgorithm,
&pk.encryptedData, &pk.encryptedData,
&content); &content);
free_PKCS8EncryptedPrivateKeyInfo(&pk); free_PKCS8EncryptedPrivateKeyInfo(&pk);
if (ret) { if (ret)
printf("decrypt encryped failed %d\n", ret);
return ret; return ret;
}
ret = decode_PKCS8PrivateKeyInfo(content.data, content.length, ret = decode_PKCS8PrivateKeyInfo(content.data, content.length,
&ki, NULL); &ki, NULL);
free_octet_string(&content); free_octet_string(&content);
if (ret) { if (ret)
printf("PKCS8PrivateKeyInfo returned %d\n", ret);
return ret; return ret;
}
key = malloc(sizeof(*key)); key = malloc(sizeof(*key));
if (key == NULL) { if (key == NULL) {
@@ -156,41 +148,27 @@ certBag_parser(struct collector *c, const void *data, size_t length,
PKCS12_CertBag cb; PKCS12_CertBag cb;
int ret; int ret;
printf("certBag\n");
ret = decode_PKCS12_CertBag(data, length, &cb, NULL); ret = decode_PKCS12_CertBag(data, length, &cb, NULL);
if (ret) if (ret)
return ret; return ret;
{
char *str;
hx509_oid_sprint(&cb.certType, &str);
printf("oid: %s\n", str);
}
ret = decode_PKCS12_OctetString(cb.certValue.data, ret = decode_PKCS12_OctetString(cb.certValue.data,
cb.certValue.length, cb.certValue.length,
&os, &os,
NULL); NULL);
free_PKCS12_CertBag(&cb); free_PKCS12_CertBag(&cb);
if (ret) { if (ret)
printf("failed with %d\n", ret); return ret;
return 1;
}
ret = decode_Certificate(os.data, os.length, &t, NULL); ret = decode_Certificate(os.data, os.length, &t, NULL);
free_octet_string(&os); free_octet_string(&os);
if (ret) { if (ret)
printf("failed with %d\n", ret); return ret;
return 1;
}
printf("cert parsed ok\n");
ret = hx509_cert_init(&t, &cert); ret = hx509_cert_init(&t, &cert);
free_Certificate(&t); free_Certificate(&t);
if (ret) { if (ret)
return ret; return ret;
}
ret = hx509_certs_add(c->certs, cert); ret = hx509_certs_add(c->certs, cert);
if (ret) { if (ret) {
@@ -212,12 +190,6 @@ certBag_parser(struct collector *c, const void *data, size_t length,
_hx509_set_cert_attribute(cert, oid, &attr->attrValues); _hx509_set_cert_attribute(cert, oid, &attr->attrValues);
} }
} }
{
const char *s = hx509_cert_get_friendly_name(cert);
if (s)
printf("cert name: %s\n", s);
}
return 0; return 0;
} }
@@ -251,11 +223,9 @@ safeContent_parser(struct collector *c, const void *data, size_t length,
heim_octet_string os; heim_octet_string os;
int ret; int ret;
printf("safeContent\n");
ret = decode_PKCS12_OctetString(data, length, &os, NULL); ret = decode_PKCS12_OctetString(data, length, &os, NULL);
if (ret) if (ret)
return 1; return ret;
ret = parse_safe_content(c, os.data, os.length); ret = parse_safe_content(c, os.data, os.length);
free_octet_string(&os); free_octet_string(&os);
return ret; return ret;
@@ -276,18 +246,14 @@ encryptedData_parser(struct collector *c, const void *data, size_t length,
&contentType, &contentType,
&content); &content);
if (ret) if (ret)
printf("decrypt encryped failed %d\n", ret); return ret;
else {
if (content.length == 0) {
printf("no content in encryped data\n");
} else if (heim_oid_cmp(&contentType, oid_id_pkcs7_data()) == 0) {
ret = parse_safe_content(c, content.data, content.length);
if (ret)
printf("parse_safe_content failed with %d\n", ret);
}
}
return 0; if (heim_oid_cmp(&contentType, oid_id_pkcs7_data()) == 0)
ret = parse_safe_content(c, content.data, content.length);
free_octet_string(&content);
free_oid(&contentType);
return ret;
} }
static int static int
@@ -305,18 +271,15 @@ envelopedData_parser(struct collector *c, const void *data, size_t length,
&contentType, &contentType,
&content); &content);
if (ret) if (ret)
printf("unenveloped failed %d\n", ret); return ret;
else {
if (content.length == 0) {
printf("no content enveloped data\n");
} else if (heim_oid_cmp(&contentType, oid_id_pkcs7_data()) == 0) {
ret = parse_safe_content(c, content.data, content.length);
if (ret)
printf("parse_safe_content failed with %d\n", ret);
}
}
return 0; if (heim_oid_cmp(&contentType, oid_id_pkcs7_data()) == 0)
ret = parse_safe_content(c, content.data, content.length);
free_octet_string(&content);
free_oid(&contentType);
return ret;
} }
@@ -328,26 +291,23 @@ struct type bagtypes[] = {
{ oid_id_pkcs7_envelopedData, envelopedData_parser } { oid_id_pkcs7_envelopedData, envelopedData_parser }
}; };
static int static void
parse_pkcs12_type(struct collector *c, const heim_oid *oid, parse_pkcs12_type(struct collector *c, const heim_oid *oid,
const void *data, size_t length, const void *data, size_t length,
const PKCS12_Attributes *attrs) const PKCS12_Attributes *attrs)
{ {
int i; int i;
for (i = 0; i < sizeof(bagtypes)/sizeof(bagtypes[0]); i++) { for (i = 0; i < sizeof(bagtypes)/sizeof(bagtypes[0]); i++)
if (heim_oid_cmp((*bagtypes[i].oid)(), oid) == 0) { if (heim_oid_cmp((*bagtypes[i].oid)(), oid) == 0)
(*bagtypes[i].func)(c, data, length, attrs); (*bagtypes[i].func)(c, data, length, attrs);
return 0;
}
}
return 1;
} }
static int static int
p12_init(hx509_certs certs, void **data, int flags, p12_init(hx509_certs certs, void **data, int flags,
const char *residue, hx509_lock lock) const char *residue, hx509_lock lock)
{ {
struct ks_pkcs12 *p12;
size_t len; size_t len;
void *buf; void *buf;
PKCS12_PFX pfx; PKCS12_PFX pfx;
@@ -357,17 +317,23 @@ p12_init(hx509_certs certs, void **data, int flags,
*data = NULL; *data = NULL;
memset(&c, 0, sizeof(c));
p12 = calloc(1, sizeof(*p12));
if (p12 == NULL)
return ENOMEM;
if (lock == NULL) if (lock == NULL)
lock = _hx509_empty_lock; lock = _hx509_empty_lock;
ret = _hx509_map_file(residue, &buf, &len); ret = _hx509_map_file(residue, &buf, &len);
if (ret) if (ret)
return ret; goto out;
ret = decode_PKCS12_PFX(buf, len, &pfx, NULL); ret = decode_PKCS12_PFX(buf, len, &pfx, NULL);
_hx509_unmap_file(buf, len); _hx509_unmap_file(buf, len);
if (ret) if (ret)
return ret; goto out;
if (heim_oid_cmp(&pfx.authSafe.contentType, oid_id_pkcs7_data()) != 0) { if (heim_oid_cmp(&pfx.authSafe.contentType, oid_id_pkcs7_data()) != 0) {
free_PKCS12_PFX(&pfx); free_PKCS12_PFX(&pfx);
@@ -406,18 +372,15 @@ p12_init(hx509_certs certs, void **data, int flags,
c.val.len = 0; c.val.len = 0;
hx509_certs_init("MEMORY:pkcs12-store", 0, NULL, &c.certs); hx509_certs_init("MEMORY:pkcs12-store", 0, NULL, &c.certs);
for (i = 0; i < as.len; i++) { for (i = 0; i < as.len; i++)
parse_pkcs12_type(&c, parse_pkcs12_type(&c,
&as.val[i].contentType, &as.val[i].contentType,
as.val[i].content->data, as.val[i].content->data,
as.val[i].content->length, as.val[i].content->length,
NULL); NULL);
}
free_PKCS12_AuthenticatedSafe(&as); free_PKCS12_AuthenticatedSafe(&as);
printf("found %lu private keys\n", (unsigned long)c.val.len);
for (i = 0; i < c.val.len; i++) { for (i = 0; i < c.val.len; i++) {
hx509_cert cert; hx509_cert cert;
hx509_query q; hx509_query q;
@@ -437,30 +400,32 @@ p12_init(hx509_certs certs, void **data, int flags,
&key); &key);
if (ret == 0) if (ret == 0)
_hx509_cert_assign_key(cert, key); _hx509_cert_assign_key(cert, key);
else
printf("failed to parse key: %d\n", ret);
hx509_cert_free(cert); hx509_cert_free(cert);
} }
}
*data = p12;
ret = 0;
out:
if (ret) {
if (p12->certs)
hx509_certs_free(&p12->certs);
free(p12);
}
if (c.unenvelop_certs)
hx509_certs_free(&c.unenvelop_certs);
for (i = 0; i < c.val.len; i++) {
free_octet_string(&c.val.data[i]->localKeyId); free_octet_string(&c.val.data[i]->localKeyId);
free_octet_string(&c.val.data[i]->data); free_octet_string(&c.val.data[i]->data);
free_AlgorithmIdentifier(&c.val.data[i]->alg); free_AlgorithmIdentifier(&c.val.data[i]->alg);
free(c.val.data[i]); free(c.val.data[i]);
} }
if (c.val.data)
free(c.val.data); free(c.val.data);
{
struct ks_pkcs12 *p12;
p12 = malloc(sizeof(*p12));
if (p12 == NULL) {
_hx509_abort("allocation failure"); /* XXX */
}
memset(p12, 0, sizeof(*p12));
p12->certs = c.certs;
*data = p12;
}
ret = 0;
out:
return ret; return ret;
} }