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

gsskrb5: make the check for dcestyle and conf_req_flag == 0 more explicit

Browse Source 
metze

Signed-off-by: Love Hornquist Astrand <lha@h5l.org>
This commit is contained in:
Stefan Metzmacher
2009-08-20 13:02:28 +02:00
committed by Love Hornquist Astrand
parent 560cb0c132
commit 40a6abd116
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/gssapi/krb5/cfx.c
View File

@@ -365,6 +365,11 @@ _gssapi_wrap_cfx_iov(OM_uint32 *minor_status,
gsshsize = sizeof(gss_cfx_wrap_token_desc) + k5hsize; gsshsize = sizeof(gss_cfx_wrap_token_desc) + k5hsize;
gsstsize = sizeof(gss_cfx_wrap_token_desc) + ec + k5tsize; gsstsize = sizeof(gss_cfx_wrap_token_desc) + ec + k5tsize;
} else { } else {
if (IS_DCE_STYLE(ctx)) {
*minor_status = EINVAL;
return GSS_S_FAILURE;
}
k5hsize = 0; k5hsize = 0;
*minor_status = krb5_crypto_length(context, ctx->crypto, *minor_status = krb5_crypto_length(context, ctx->crypto,
KRB5_CRYPTO_TYPE_CHECKSUM, KRB5_CRYPTO_TYPE_CHECKSUM,
@@ -381,12 +386,6 @@ _gssapi_wrap_cfx_iov(OM_uint32 *minor_status,
*/ */
if (trailer == NULL) { if (trailer == NULL) {
/* conf_req_flag=0 doesn't support DCE_STYLE */
if (conf_req_flag == 0) {
*minor_status = EINVAL;
major_status = GSS_S_FAILURE;
goto failure;
}
rrc = gsstsize; rrc = gsstsize;
if (IS_DCE_STYLE(ctx)) if (IS_DCE_STYLE(ctx))
rrc -= ec; rrc -= ec;