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

Handle windows windows LH with interesting content info packets (broken)

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-10-01 10:38:30 -07:00
parent 7eac18abc3
commit 100c440153
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/krb5/pkinit.c
View File

@@ -1174,8 +1174,26 @@ pk_rd_pa_reply_enckey(krb5_context context,
heim_octet_string out; heim_octet_string out;
ret = hx509_cms_unwrap_ContentInfo(&content, &type, &out, NULL); ret = hx509_cms_unwrap_ContentInfo(&content, &type, &out, NULL);
if (ret) if (ret) {
goto out; /* windows LH with interesting CMS packets */
size_t ph = 1 + der_length_len(content.length);
unsigned char *ptr = malloc(content.length + ph);
size_t l;
memcpy(ptr + ph, content.data, content.length);
ret = der_put_length_and_tag (ptr + ph - 1, ph, content.length,
ASN1_C_UNIV, CONS, UT_Sequence, &l);
if (ret)
return ret;
free(content.data);
content.data = ptr;
content.length += ph;
ret = hx509_cms_unwrap_ContentInfo(&content, &type, &out, NULL);
if (ret)
goto out;
}
if (der_heim_oid_cmp(&type, &asn1_oid_id_pkcs7_signedData)) { if (der_heim_oid_cmp(&type, &asn1_oid_id_pkcs7_signedData)) {
ret = EINVAL; /* XXX */ ret = EINVAL; /* XXX */
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,