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

kdc: remove e_text argument to _kdc_encode_reply()

Browse Source 
e_text is part of astgs_request_t, so it doesn't need to be an explicit
argument to _kdc_encode_reply()
This commit is contained in:
Luke Howard
2021-12-24 10:33:08 +11:00
committed by Nico Williams
parent b6be850e0d
commit f49e99e15f
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kdc/kerberos5.c
View File

@@ -1086,7 +1086,6 @@ _kdc_encode_reply(krb5_context context,
int skvno, const EncryptionKey *skey, int skvno, const EncryptionKey *skey,
int ckvno, int ckvno,
int rk_is_subkey, int rk_is_subkey,
const char **e_text,
krb5_data *reply) krb5_data *reply)
{ {
unsigned char *buf; unsigned char *buf;
@@ -1215,7 +1214,7 @@ _kdc_encode_reply(krb5_context context,
if(buf_size != len) { if(buf_size != len) {
free(buf); free(buf);
kdc_log(context, config, 4, "Internal error in ASN.1 encoder"); kdc_log(context, config, 4, "Internal error in ASN.1 encoder");
*e_text = "KDC internal error"; _kdc_set_e_text(r, "KDC internal error");
return KRB5KRB_ERR_GENERIC; return KRB5KRB_ERR_GENERIC;
} }
ret = krb5_crypto_init(context, &r->reply_key, 0, &crypto); ret = krb5_crypto_init(context, &r->reply_key, 0, &crypto);
@@ -1257,7 +1256,7 @@ _kdc_encode_reply(krb5_context context,
if(buf_size != len) { if(buf_size != len) {
free(buf); free(buf);
kdc_log(context, config, 4, "Internal error in ASN.1 encoder"); kdc_log(context, config, 4, "Internal error in ASN.1 encoder");
*e_text = "KDC internal error"; _kdc_set_e_text(r, "KDC internal error");
return KRB5KRB_ERR_GENERIC; return KRB5KRB_ERR_GENERIC;
} }
reply->data = buf; reply->data = buf;
@@ -2755,7 +2754,7 @@ _kdc_as_rep(astgs_request_t r)
r, req->req_body.nonce, setype, r, req->req_body.nonce, setype,
r->server->entry.kvno, &skey->key, r->server->entry.kvno, &skey->key,
pa_used_flag_isset(r, PA_REPLACE_REPLY_KEY) ? 0 : r->client->entry.kvno, pa_used_flag_isset(r, PA_REPLACE_REPLY_KEY) ? 0 : r->client->entry.kvno,
0, &r->e_text, r->reply); 0, r->reply);
if (ret) if (ret)
goto out; goto out;

4
kdc/krb5tgs.c
View File

@@ -603,7 +603,6 @@ tgs_make_reply(astgs_request_t r,
krb5_boolean add_ticket_sig) krb5_boolean add_ticket_sig)
{ {
KDC_REQ_BODY *b = &r->req.req_body; KDC_REQ_BODY *b = &r->req.req_body;
const char **e_text = &r->e_text;
krb5_data *reply = r->reply; krb5_data *reply = r->reply;
KDC_REP *rep = &r->rep; KDC_REP *rep = &r->rep;
EncTicketPart *et = &r->et; EncTicketPart *et = &r->et;
@@ -845,8 +844,7 @@ tgs_make_reply(astgs_request_t r,
DES3? */ DES3? */
ret = _kdc_encode_reply(r->context, r->config, r, b->nonce, ret = _kdc_encode_reply(r->context, r->config, r, b->nonce,
serverkey->keytype, kvno, serverkey->keytype, kvno,
serverkey, 0, r->rk_is_subkey, serverkey, 0, r->rk_is_subkey, reply);
e_text, reply);
if (is_weak) if (is_weak)
krb5_enctype_disable(r->context, serverkey->keytype); krb5_enctype_disable(r->context, serverkey->keytype);