use the first proposed enable enctype
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13739 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
13
kdc/pkinit.c
13
kdc/pkinit.c
@@ -904,6 +904,7 @@ pk_mk_pa_reply(krb5_context context,
|
|||||||
void *buf;
|
void *buf;
|
||||||
size_t len, size;
|
size_t len, size;
|
||||||
krb5_enctype enctype;
|
krb5_enctype enctype;
|
||||||
|
int i;
|
||||||
|
|
||||||
if (!enable_pkinit) {
|
if (!enable_pkinit) {
|
||||||
krb5_clear_error_string(context);
|
krb5_clear_error_string(context);
|
||||||
@@ -913,15 +914,19 @@ pk_mk_pa_reply(krb5_context context,
|
|||||||
memset(&rep, 0, sizeof(rep));
|
memset(&rep, 0, sizeof(rep));
|
||||||
|
|
||||||
if (req->req_body.etype.len < 1) {
|
if (req->req_body.etype.len < 1) {
|
||||||
|
}
|
||||||
|
|
||||||
|
/* XXX select best/allowed enctype */
|
||||||
|
for (i = 0; i < req->req_body.etype.len; i++)
|
||||||
|
if (krb5_enctype_valid(context, req->req_body.etype.val[i]) == 0)
|
||||||
|
break;
|
||||||
|
if (req->req_body.etype.len <= i) {
|
||||||
ret = KRB5KRB_ERR_GENERIC;
|
ret = KRB5KRB_ERR_GENERIC;
|
||||||
krb5_set_error_string(context,
|
krb5_set_error_string(context,
|
||||||
"No valid enctype available from client");
|
"No valid enctype available from client");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
enctype = req->req_body.etype.val[i];
|
||||||
/* XXX select best/allowed enctype */
|
|
||||||
enctype = req->req_body.etype.val[0];
|
|
||||||
enctype = ETYPE_DES3_CBC_SHA1;
|
|
||||||
|
|
||||||
if (client_params->dh == NULL) {
|
if (client_params->dh == NULL) {
|
||||||
rep.element = choice_PA_PK_AS_REP_encKeyPack;
|
rep.element = choice_PA_PK_AS_REP_encKeyPack;
|
||||||
|
Reference in New Issue
Block a user