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

lib/krb5: let krb5_init_creds_step() return an allocated out buffer

Browse Source 
It should not return pointers to the internal state,
this matches the way the krb5_init_creds_step() works in MIT.

NOTE: commit 1cdc9d5f3c
"krb5: export krb5_init_creds_step()" exported
krb5_init_creds_step() the first time, but that's
not in any released version, so it should be fine
to change the behavior as there can't be any
external users of the function.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Stefan Metzmacher
2022-03-03 17:49:36 +01:00
committed by Jeffrey Altman
parent 30c978f013
commit b0bc54c921
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/krb5/init_creds_pw.c
View File

@@ -3411,8 +3411,11 @@ init_creds_step(krb5_context context,
if(len != ctx->req_buffer.length) if(len != ctx->req_buffer.length)
krb5_abortx(context, "internal error in ASN.1 encoder"); krb5_abortx(context, "internal error in ASN.1 encoder");
out->data = ctx->req_buffer.data; ret = krb5_data_copy(out,
out->length = ctx->req_buffer.length; ctx->req_buffer.data,
ctx->req_buffer.length);
if (ret)
goto out;
*flags = KRB5_INIT_CREDS_STEP_FLAG_CONTINUE; *flags = KRB5_INIT_CREDS_STEP_FLAG_CONTINUE;
@@ -3434,8 +3437,8 @@ init_creds_step(krb5_context context,
* *
* @param context a Kerberos 5 context. * @param context a Kerberos 5 context.
* @param ctx ctx krb5_init_creds_context context. * @param ctx ctx krb5_init_creds_context context.
* @param in input data from KDC, first round it should be reset by krb5_data_zer(). * @param in input data from KDC, first round it should be reset by krb5_data_zero().
* @param out reply to KDC. * @param out reply to KDC. The caller needs to call krb5_data_free()
* @param flags status of the round, if * @param flags status of the round, if
* KRB5_INIT_CREDS_STEP_FLAG_CONTINUE is set, continue one more round. * KRB5_INIT_CREDS_STEP_FLAG_CONTINUE is set, continue one more round.
* *
@@ -3701,6 +3704,7 @@ krb5_init_creds_get(krb5_context context, krb5_init_creds_context ctx)
ret = krb5_sendto_context (context, stctx, &out, ret = krb5_sendto_context (context, stctx, &out,
ctx->cred.client->realm, &in); ctx->cred.client->realm, &in);
krb5_data_free(&out);
if (ret) if (ret)
goto out; goto out;