update to new paChecksum definition, use hdb_entry_ex
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16733 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
16
kdc/pkinit.c
16
kdc/pkinit.c
@@ -175,13 +175,17 @@ pk_check_pkauthenticator(krb5_context context,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (a->paChecksum.length != checksum.checksum.length ||
|
if (a->paChecksum == NULL) {
|
||||||
memcmp(a->paChecksum.data, checksum.checksum.data,
|
krb5_clear_error_string(context);
|
||||||
checksum.checksum.length) != 0)
|
ret = KRB5_KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED;
|
||||||
{
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (heim_octet_string_cmp(a->paChecksum, &checksum.checksum) != 0) {
|
||||||
krb5_clear_error_string(context);
|
krb5_clear_error_string(context);
|
||||||
ret = KRB5KRB_ERR_GENERIC;
|
ret = KRB5KRB_ERR_GENERIC;
|
||||||
}
|
}
|
||||||
|
out:
|
||||||
free_Checksum(&checksum);
|
free_Checksum(&checksum);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
@@ -1122,7 +1126,7 @@ krb5_error_code
|
|||||||
_kdc_pk_mk_pa_reply(krb5_context context,
|
_kdc_pk_mk_pa_reply(krb5_context context,
|
||||||
krb5_kdc_configuration *config,
|
krb5_kdc_configuration *config,
|
||||||
pk_client_params *client_params,
|
pk_client_params *client_params,
|
||||||
const hdb_entry *client,
|
const hdb_entry_ex *client,
|
||||||
const KDC_REQ *req,
|
const KDC_REQ *req,
|
||||||
const krb5_data *req_buffer,
|
const krb5_data *req_buffer,
|
||||||
krb5_keyblock **reply_key,
|
krb5_keyblock **reply_key,
|
||||||
@@ -1379,7 +1383,7 @@ krb5_error_code
|
|||||||
_kdc_pk_check_client(krb5_context context,
|
_kdc_pk_check_client(krb5_context context,
|
||||||
krb5_kdc_configuration *config,
|
krb5_kdc_configuration *config,
|
||||||
krb5_principal client_princ,
|
krb5_principal client_princ,
|
||||||
const hdb_entry *client,
|
const hdb_entry_ex *client,
|
||||||
pk_client_params *client_params,
|
pk_client_params *client_params,
|
||||||
char **subject_name)
|
char **subject_name)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user