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

lib/krb5: remove unused krb5_krbhst_info argument from _krb5_pk_rd_pa_reply()

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Stefan Metzmacher
2022-03-03 17:12:18 +01:00
committed by Jeffrey Altman
parent c5feb63c55
commit 600e126135
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/krb5/init_creds_pw.c
View File

@@ -1243,7 +1243,6 @@ pkinit_step(krb5_context context, krb5_init_creds_context ctx, void *pa_ctx, PA_
a->req_body.realm, a->req_body.realm,
ctx->pk_init_ctx, ctx->pk_init_ctx,
rep->enc_part.etype, rep->enc_part.etype,
NULL,
ctx->pk_nonce, ctx->pk_nonce,
&ctx->req_buffer, &ctx->req_buffer,
pa, pa,

7
lib/krb5/pkinit.c
View File

@@ -1567,7 +1567,6 @@ _krb5_pk_rd_pa_reply(krb5_context context,
const char *realm, const char *realm,
void *c, void *c,
krb5_enctype etype, krb5_enctype etype,
const krb5_krbhst_info *hi,
unsigned nonce, unsigned nonce,
const krb5_data *req_buffer, const krb5_data *req_buffer,
PA_DATA *pa, PA_DATA *pa,
@@ -1658,14 +1657,14 @@ _krb5_pk_rd_pa_reply(krb5_context context,
switch (rep.element) { switch (rep.element) {
case choice_PA_PK_AS_REP_dhInfo: case choice_PA_PK_AS_REP_dhInfo:
ret = pk_rd_pa_reply_dh(context, &data, &oid, realm, ctx, etype, hi, ret = pk_rd_pa_reply_dh(context, &data, &oid, realm, ctx, etype, NULL,
ctx->clientDHNonce, ctx->clientDHNonce,
rep.u.dhInfo.serverDHNonce, rep.u.dhInfo.serverDHNonce,
nonce, pa, key); nonce, pa, key);
break; break;
case choice_PA_PK_AS_REP_encKeyPack: case choice_PA_PK_AS_REP_encKeyPack:
ret = pk_rd_pa_reply_enckey(context, PKINIT_27, &data, &oid, realm, ret = pk_rd_pa_reply_enckey(context, PKINIT_27, &data, &oid, realm,
ctx, etype, hi, nonce, req_buffer, pa, key); ctx, etype, NULL, nonce, req_buffer, pa, key);
break; break;
default: default:
krb5_abortx(context, "pk-init as-rep case not possible to happen"); krb5_abortx(context, "pk-init as-rep case not possible to happen");
@@ -1717,7 +1716,7 @@ _krb5_pk_rd_pa_reply(krb5_context context,
} }
ret = pk_rd_pa_reply_enckey(context, PKINIT_WIN2K, &data, &oid, realm, ret = pk_rd_pa_reply_enckey(context, PKINIT_WIN2K, &data, &oid, realm,
ctx, etype, hi, nonce, req_buffer, pa, key); ctx, etype, NULL, nonce, req_buffer, pa, key);
der_free_octet_string(&data); der_free_octet_string(&data);
der_free_oid(&oid); der_free_oid(&oid);