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

(_kdc_tkt_add_if_relevant_ad): use _kdc_tkt_add_if_relevant_ad to add the SignedPath.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19260 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-12-06 21:16:03 +00:00
parent eb2670591c
commit 9fed7e931e
1 changed files with 8 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
kdc/krb5tgs.c
View File

@@ -119,7 +119,7 @@ _kdc_add_KRB5SignedPath(krb5_context context,
if (server && principals) { if (server && principals) {
ret = add_KRB5SignedPathPrincipals(principals, server); ret = add_KRB5SignedPathPrincipals(principals, server);
if (ret) if (ret)
goto out; return ret;
} }
{ {
@@ -131,7 +131,7 @@ _kdc_add_KRB5SignedPath(krb5_context context,
ASN1_MALLOC_ENCODE(KRB5SignedPathData, data.data, data.length, ASN1_MALLOC_ENCODE(KRB5SignedPathData, data.data, data.length,
&spd, &size, ret); &spd, &size, ret);
if (ret) if (ret)
goto out; return ret;
if (data.length != size) if (data.length != size)
krb5_abortx(context, "internal asn.1 encoder error"); krb5_abortx(context, "internal asn.1 encoder error");
} }
@@ -159,12 +159,12 @@ _kdc_add_KRB5SignedPath(krb5_context context,
krb5_crypto_destroy(context, crypto); krb5_crypto_destroy(context, crypto);
free(data.data); free(data.data);
if (ret) if (ret)
goto out; return ret;
ASN1_MALLOC_ENCODE(KRB5SignedPath, data.data, data.length, &sp, &size, ret); ASN1_MALLOC_ENCODE(KRB5SignedPath, data.data, data.length, &sp, &size, ret);
free_Checksum(&sp.cksum); free_Checksum(&sp.cksum);
if (ret) if (ret)
goto out; return ret;
if (data.length != size) if (data.length != size)
krb5_abortx(context, "internal asn.1 encoder error"); krb5_abortx(context, "internal asn.1 encoder error");
@@ -174,46 +174,11 @@ _kdc_add_KRB5SignedPath(krb5_context context,
* authorization data field. * authorization data field.
*/ */
if (tkt->authorization_data == NULL) { ret = _kdc_tkt_add_if_relevant_ad(context, tkt,
tkt->authorization_data = calloc(1, sizeof(*tkt->authorization_data)); KRB5_AUTHDATA_SIGNTICKET, &data);
if (tkt->authorization_data == NULL) {
ret = ENOMEM;
goto out;
}
}
/* add the entry to the last element */
{
AuthorizationData ad = { 0, NULL };
AuthorizationDataElement ade;
ade.ad_type = KRB5_AUTHDATA_SIGNTICKET;
ade.ad_data = data;
ret = add_AuthorizationData(&ad, &ade);
krb5_data_free(&data); krb5_data_free(&data);
if (ret)
return ret; return ret;
ASN1_MALLOC_ENCODE(AuthorizationData, data.data, data.length,
&ad, &size, ret);
free_AuthorizationData(&ad);
if (ret)
return ret;
if (data.length != size)
krb5_abortx(context, "internal asn.1 encoder error");
ade.ad_type = KRB5_AUTHDATA_IF_RELEVANT;
ade.ad_data = data;
ret = add_AuthorizationData(tkt->authorization_data, &ade);
krb5_data_free(&data);
if (ret)
return ret;
}
out:
return 0;
} }
static krb5_error_code static krb5_error_code