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

Make hx509_cms_{,un}wrap_ContentInfo usable in asn1 un-aware code.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17115 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-20 19:37:13 +00:00
parent a1d2bc1334
commit d1e9d70d7c
1 changed files with 71 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
lib/hx509/cms.c
View File

@@ -41,21 +41,78 @@ RCSID("$Id$");
int int
hx509_cms_wrap_ContentInfo(const heim_oid *oid, hx509_cms_wrap_ContentInfo(const heim_oid *oid,
const heim_octet_string *buf, const heim_octet_string *buf,
ContentInfo *content_info) heim_octet_string *res)
{ {
ContentInfo ci;
size_t size;
int ret; int ret;
ret = copy_oid(oid, &content_info->contentType); memset(res, 0, sizeof(*res));
memset(&ci, 0, sizeof(ci));
ret = copy_oid(oid, &ci.contentType);
if (ret) if (ret)
return ret; return ret;
ALLOC(content_info->content, 1); ALLOC(ci.content, 1);
if (content_info->content == NULL) if (ci.content == NULL) {
free_ContentInfo(&ci);
return ENOMEM; return ENOMEM;
content_info->content->data = malloc(buf->length); }
if (content_info->content->data == NULL) ci.content->data = malloc(buf->length);
if (ci.content->data == NULL) {
free_ContentInfo(&ci);
return ENOMEM; return ENOMEM;
memcpy(content_info->content->data, buf->data, buf->length); }
content_info->content->length = buf->length; memcpy(ci.content->data, buf->data, buf->length);
ci.content->length = buf->length;
ASN1_MALLOC_ENCODE(ContentInfo, res->data, res->length, &ci, &size, ret);
free_ContentInfo(&ci);
if (ret)
return ret;
if (res->length != size)
_hx509_abort("internal ASN.1 encoder error");
return 0;
}
int
hx509_cms_unwrap_ContentInfo(const heim_octet_string *in,
heim_oid *oid,
heim_octet_string *out,
int *have_data)
{
ContentInfo ci;
size_t size;
int ret;
memset(oid, 0, sizeof(*oid));
memset(out, 0, sizeof(*out));
ret = decode_ContentInfo(in->data, in->length, &ci, &size);
if (ret)
return ret;
ret = copy_oid(&ci.contentType, oid);
if (ret) {
free_ContentInfo(&ci);
return ret;
}
if (ci.content) {
ret = copy_octet_string(ci.content, out);
if (ret) {
free_oid(oid);
free_ContentInfo(&ci);
return ret;
}
} else
memset(out, 0, sizeof(*out));
if (have_data)
*have_data = (ci.content != NULL) ? 1 : 0;
free_ContentInfo(&ci);
return 0; return 0;
} }