Use auth_context->keyblock if ap_options.use_session_key.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3909 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -112,8 +112,6 @@ krb5_decode_ap_req(krb5_context context,
|
|||||||
free_AP_REQ(ap_req);
|
free_AP_REQ(ap_req);
|
||||||
return KRB5KRB_AP_ERR_BADVERSION;
|
return KRB5KRB_AP_ERR_BADVERSION;
|
||||||
}
|
}
|
||||||
if (ap_req->ap_options.use_session_key)
|
|
||||||
abort ();
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,8 +169,18 @@ krb5_verify_ap_req(krb5_context context,
|
|||||||
}else
|
}else
|
||||||
krb5_auth_con_init(context, &ac);
|
krb5_auth_con_init(context, &ac);
|
||||||
|
|
||||||
ret = krb5_decrypt_ticket(context, &ap_req->ticket, keyblock,
|
if (ap_req->ap_options.use_session_key && auth_context->keyblock){
|
||||||
&t.ticket);
|
ret = krb5_decrypt_ticket(context, &ap_req->ticket,
|
||||||
|
auth_context->keyblock,
|
||||||
|
&t.ticket);
|
||||||
|
krb5_free_keyblock(context, auth_context->keyblock);
|
||||||
|
auth_context->keyblock = NULL;
|
||||||
|
}else
|
||||||
|
ret = krb5_decrypt_ticket(context, &ap_req->ticket,
|
||||||
|
keyblock,
|
||||||
|
&t.ticket);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(ret)
|
if(ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
Reference in New Issue
Block a user