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

(_kdc_pk_rd_padata): accept both pkcs-7 and pkauthdata as the signeddata oid

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20943 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-06-06 22:14:36 +00:00
parent 3d7fc2b1e7
commit 6f787893cd
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kdc/pkinit.c
View File

@@ -375,7 +375,6 @@ _kdc_pk_rd_padata(krb5_context context,
krb5_data eContent = { 0, NULL }; krb5_data eContent = { 0, NULL };
krb5_data signed_content = { 0, NULL }; krb5_data signed_content = { 0, NULL };
const char *type = "unknown type"; const char *type = "unknown type";
const heim_oid *pa_contentType;
int have_data = 0; int have_data = 0;
*ret_params = NULL; *ret_params = NULL;
@@ -396,7 +395,6 @@ _kdc_pk_rd_padata(krb5_context context,
PA_PK_AS_REQ_Win2k r; PA_PK_AS_REQ_Win2k r;
type = "PK-INIT-Win2k"; type = "PK-INIT-Win2k";
pa_contentType = oid_id_pkcs7_data();
ret = decode_PA_PK_AS_REQ_Win2k(pa->padata_value.data, ret = decode_PA_PK_AS_REQ_Win2k(pa->padata_value.data,
pa->padata_value.length, pa->padata_value.length,
@@ -422,7 +420,6 @@ _kdc_pk_rd_padata(krb5_context context,
PA_PK_AS_REQ r; PA_PK_AS_REQ r;
type = "PK-INIT-IETF"; type = "PK-INIT-IETF";
pa_contentType = oid_id_pkauthdata();
ret = decode_PA_PK_AS_REQ(pa->padata_value.data, ret = decode_PA_PK_AS_REQ(pa->padata_value.data,
pa->padata_value.length, pa->padata_value.length,
@@ -548,7 +545,9 @@ _kdc_pk_rd_padata(krb5_context context,
} }
/* Signature is correct, now verify the signed message */ /* Signature is correct, now verify the signed message */
if (der_heim_oid_cmp(&eContentType, pa_contentType)) { if (der_heim_oid_cmp(&eContentType, oid_id_pkcs7_data()) != 0 &&
der_heim_oid_cmp(&eContentType, oid_id_pkauthdata()) != 0)
{
krb5_set_error_string(context, "got wrong oid for pkauthdata"); krb5_set_error_string(context, "got wrong oid for pkauthdata");
ret = KRB5_BADMSGTYPE; ret = KRB5_BADMSGTYPE;
goto out; goto out;