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

Sprinkle more hx509_context so we can return propper errors.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18861 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-24 13:34:21 +00:00
parent 7f316a5b1e
commit f58f609484
2 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/hx509/collector.c
View File

@@ -107,7 +107,8 @@ free_private_key(struct private_key *key)
}
int
_hx509_collector_private_key_add(struct hx509_collector *c,
_hx509_collector_private_key_add(hx509_context context,
struct hx509_collector *c,
const AlgorithmIdentifier *alg,
hx509_private_key private_key,
const heim_octet_string *key_data,
@@ -124,17 +125,21 @@ _hx509_collector_private_key_add(struct hx509_collector *c,
d = realloc(c->val.data, (c->val.len + 1) * sizeof(c->val.data[0]));
if (d == NULL) {
free(key);
hx509_set_error_string(context, 0, ENOMEM, "Out of memory");
return ENOMEM;
}
c->val.data = d;
ret = copy_AlgorithmIdentifier(alg, &key->alg);
if (ret)
if (ret) {
hx509_set_error_string(context, 0, ret, "Failed to copy "
"AlgorithmIdentifier");
goto out;
}
if (private_key) {
key->private_key = private_key;
} else {
ret = _hx509_parse_private_key(&alg->algorithm,
ret = _hx509_parse_private_key(context, &alg->algorithm,
key_data->data, key_data->length,
&key->private_key);
if (ret)
@@ -142,8 +147,11 @@ _hx509_collector_private_key_add(struct hx509_collector *c,
}
if (localKeyId) {
ret = der_copy_octet_string(localKeyId, &key->localKeyId);
if (ret)
if (ret) {
hx509_set_error_string(context, 0, ret,
"Failed to copy localKeyId");
goto out;
}
} else
memset(&key->localKeyId, 0, sizeof(key->localKeyId));