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

set minor_status

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5857 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-04-07 12:09:50 +00:00
parent 4c55325e92
commit 9bef97b773
4 changed files with 354 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/gssapi/display_status.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998 Kungliga Tekniska H<>gskolan * Copyright (c) 1998, 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -114,12 +114,16 @@ OM_uint32 gss_display_status
asprintf (&buf, "%s %s", asprintf (&buf, "%s %s",
calling_error(GSS_CALLING_ERROR(status_value)), calling_error(GSS_CALLING_ERROR(status_value)),
routine_error(GSS_ROUTINE_ERROR(status_value))); routine_error(GSS_ROUTINE_ERROR(status_value)));
if (buf == NULL) if (buf == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
}
} else if (status_type == GSS_C_MECH_CODE) { } else if (status_type == GSS_C_MECH_CODE) {
buf = strdup(krb5_get_err_text (gssapi_krb5_context, status_value)); buf = strdup(krb5_get_err_text (gssapi_krb5_context, status_value));
if (buf == NULL) if (buf == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
}
} else } else
return GSS_S_BAD_STATUS; return GSS_S_BAD_STATUS;

329
lib/gssapi/init_sec_context.c
View File

@@ -57,197 +57,208 @@ init_auth
OM_uint32 * time_rec OM_uint32 * time_rec
) )
{ {
OM_uint32 ret; OM_uint32 ret;
krb5_error_code kret; krb5_error_code kret;
krb5_flags ap_options; krb5_flags ap_options;
krb5_creds this_cred, *cred; krb5_creds this_cred, *cred;
krb5_data outbuf; krb5_data outbuf;
krb5_ccache ccache; krb5_ccache ccache;
u_int32_t flags; u_int32_t flags;
Authenticator *auth; Authenticator *auth;
krb5_data authenticator; krb5_data authenticator;
Checksum cksum; Checksum cksum;
krb5_enctype enctype; krb5_enctype enctype;
outbuf.length = 0; outbuf.length = 0;
outbuf.data = NULL; outbuf.data = NULL;
*minor_status = 0;
*context_handle = malloc(sizeof(**context_handle));
if (*context_handle == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
(*context_handle)->auth_context = NULL;
(*context_handle)->source = NULL;
(*context_handle)->target = NULL;
(*context_handle)->flags = 0;
(*context_handle)->more_flags = 0;
*context_handle = malloc(sizeof(**context_handle)); kret = krb5_auth_con_init (gssapi_krb5_context,
if (*context_handle == NULL) &(*context_handle)->auth_context);
return GSS_S_FAILURE; if (kret) {
*minor_status = kret;
ret = GSS_S_FAILURE;
goto failure;
}
(*context_handle)->auth_context = NULL; {
(*context_handle)->source = NULL; int32_t tmp;
(*context_handle)->target = NULL;
(*context_handle)->flags = 0;
(*context_handle)->more_flags = 0;
kret = krb5_auth_con_init (gssapi_krb5_context, krb5_auth_con_getflags(gssapi_krb5_context,
&(*context_handle)->auth_context); (*context_handle)->auth_context,
if (kret) { &tmp);
ret = GSS_S_FAILURE; tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE;
goto failure; krb5_auth_con_setflags(gssapi_krb5_context,
} (*context_handle)->auth_context,
tmp);
}
{ if (actual_mech_type)
int32_t tmp; *actual_mech_type = GSS_KRB5_MECHANISM;
krb5_auth_con_getflags(gssapi_krb5_context, flags = 0;
(*context_handle)->auth_context, ap_options = 0;
&tmp); if (req_flags & GSS_C_DELEG_FLAG)
tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE; ; /* XXX */
krb5_auth_con_setflags(gssapi_krb5_context, if (req_flags & GSS_C_MUTUAL_FLAG) {
(*context_handle)->auth_context, flags |= GSS_C_MUTUAL_FLAG;
tmp); ap_options |= AP_OPTS_MUTUAL_REQUIRED;
} }
if (req_flags & GSS_C_REPLAY_FLAG)
; /* XXX */
if (req_flags & GSS_C_SEQUENCE_FLAG)
; /* XXX */
if (req_flags & GSS_C_ANON_FLAG)
; /* XXX */
flags |= GSS_C_CONF_FLAG;
flags |= GSS_C_INTEG_FLAG;
flags |= GSS_C_SEQUENCE_FLAG;
if (actual_mech_type) if (ret_flags)
*actual_mech_type = GSS_KRB5_MECHANISM; *ret_flags = flags;
(*context_handle)->flags = flags;
(*context_handle)->more_flags = LOCAL;
flags = 0; kret = krb5_cc_default (gssapi_krb5_context, &ccache);
ap_options = 0; if (kret) {
if (req_flags & GSS_C_DELEG_FLAG) *minor_status = kret;
; /* XXX */ ret = GSS_S_FAILURE;
if (req_flags & GSS_C_MUTUAL_FLAG) { goto failure;
flags |= GSS_C_MUTUAL_FLAG; }
ap_options |= AP_OPTS_MUTUAL_REQUIRED;
}
if (req_flags & GSS_C_REPLAY_FLAG)
; /* XXX */
if (req_flags & GSS_C_SEQUENCE_FLAG)
; /* XXX */
if (req_flags & GSS_C_ANON_FLAG)
; /* XXX */
flags |= GSS_C_CONF_FLAG;
flags |= GSS_C_INTEG_FLAG;
flags |= GSS_C_SEQUENCE_FLAG;
if (ret_flags) kret = krb5_cc_get_principal (gssapi_krb5_context,
*ret_flags = flags; ccache,
(*context_handle)->flags = flags; &(*context_handle)->source);
(*context_handle)->more_flags = LOCAL; if (kret) {
*minor_status = kret;
ret = GSS_S_FAILURE;
goto failure;
}
kret = krb5_cc_default (gssapi_krb5_context, &ccache); kret = krb5_copy_principal (gssapi_krb5_context,
if (kret) { target_name,
ret = GSS_S_FAILURE; &(*context_handle)->target);
goto failure; if (kret) {
} *minor_status = kret;
ret = GSS_S_FAILURE;
goto failure;
}
kret = krb5_cc_get_principal (gssapi_krb5_context, memset(&this_cred, 0, sizeof(this_cred));
ccache, this_cred.client = (*context_handle)->source;
&(*context_handle)->source); this_cred.server = (*context_handle)->target;
if (kret) { this_cred.times.endtime = 0;
ret = GSS_S_FAILURE; this_cred.session.keytype = ETYPE_DES_CBC_CRC;
goto failure;
}
kret = krb5_copy_principal (gssapi_krb5_context,
target_name,
&(*context_handle)->target);
if (kret) {
ret = GSS_S_FAILURE;
goto failure;
}
memset(&this_cred, 0, sizeof(this_cred));
this_cred.client = (*context_handle)->source;
this_cred.server = (*context_handle)->target;
this_cred.times.endtime = 0;
this_cred.session.keytype = KEYTYPE_DES;
kret = krb5_get_credentials (gssapi_krb5_context, kret = krb5_get_credentials (gssapi_krb5_context,
KRB5_TC_MATCH_KEYTYPE, KRB5_TC_MATCH_KEYTYPE,
ccache, ccache,
&this_cred, &this_cred,
&cred); &cred);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; *minor_status = kret;
goto failure; ret = GSS_S_FAILURE;
} goto failure;
}
krb5_auth_con_setkey(gssapi_krb5_context, krb5_auth_con_setkey(gssapi_krb5_context,
(*context_handle)->auth_context, (*context_handle)->auth_context,
&cred->session); &cred->session);
kret = gssapi_krb5_create_8003_checksum (input_chan_bindings, kret = gssapi_krb5_create_8003_checksum (input_chan_bindings,
flags, flags,
&cksum); &cksum);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; *minor_status = kret;
goto failure; ret = GSS_S_FAILURE;
} goto failure;
}
#if 1 #if 1
enctype = (*context_handle)->auth_context->keyblock->keytype; enctype = (*context_handle)->auth_context->keyblock->keytype;
#else #else
if ((*context_handle)->auth_context->enctype) if ((*context_handle)->auth_context->enctype)
enctype = (*context_handle)->auth_context->enctype; enctype = (*context_handle)->auth_context->enctype;
else { else {
kret = krb5_keytype_to_enctype(gssapi_krb5_context, kret = krb5_keytype_to_enctype(gssapi_krb5_context,
(*context_handle)->auth_context->keyblock->keytype, (*context_handle)->auth_context->keyblock->keytype,
&enctype); &enctype);
if (kret) if (kret)
return kret; return kret;
} }
#endif #endif
kret = krb5_build_authenticator (gssapi_krb5_context, kret = krb5_build_authenticator (gssapi_krb5_context,
(*context_handle)->auth_context, (*context_handle)->auth_context,
enctype, enctype,
cred, cred,
&cksum, &cksum,
&auth, &auth,
&authenticator); &authenticator);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; *minor_status = kret;
goto failure; ret = GSS_S_FAILURE;
} goto failure;
}
kret = krb5_build_ap_req (gssapi_krb5_context, kret = krb5_build_ap_req (gssapi_krb5_context,
enctype, enctype,
cred, cred,
ap_options, ap_options,
authenticator, authenticator,
&outbuf); &outbuf);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; *minor_status = kret;
goto failure; ret = GSS_S_FAILURE;
} goto failure;
}
ret = gssapi_krb5_encapsulate (&outbuf, ret = gssapi_krb5_encapsulate (&outbuf,
output_token, output_token,
"\x01\x00"); "\x01\x00");
if (ret) if (ret) {
goto failure; *minor_status = kret;
goto failure;
}
if (flags & GSS_C_MUTUAL_FLAG) { if (flags & GSS_C_MUTUAL_FLAG) {
return GSS_S_CONTINUE_NEEDED; return GSS_S_CONTINUE_NEEDED;
} else { } else {
(*context_handle)->more_flags |= OPEN; (*context_handle)->more_flags |= OPEN;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }
failure: failure:
krb5_auth_con_free (gssapi_krb5_context, krb5_auth_con_free (gssapi_krb5_context,
(*context_handle)->auth_context); (*context_handle)->auth_context);
if((*context_handle)->source) if((*context_handle)->source)
krb5_free_principal (gssapi_krb5_context, krb5_free_principal (gssapi_krb5_context,
(*context_handle)->source); (*context_handle)->source);
if((*context_handle)->target) if((*context_handle)->target)
krb5_free_principal (gssapi_krb5_context, krb5_free_principal (gssapi_krb5_context,
(*context_handle)->target); (*context_handle)->target);
free (*context_handle); free (*context_handle);
krb5_data_free (&outbuf); krb5_data_free (&outbuf);
*context_handle = GSS_C_NO_CONTEXT; *context_handle = GSS_C_NO_CONTEXT;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
static OM_uint32 static OM_uint32

10
lib/gssapi/krb5/display_status.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998 Kungliga Tekniska H<>gskolan * Copyright (c) 1998, 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -114,12 +114,16 @@ OM_uint32 gss_display_status
asprintf (&buf, "%s %s", asprintf (&buf, "%s %s",
calling_error(GSS_CALLING_ERROR(status_value)), calling_error(GSS_CALLING_ERROR(status_value)),
routine_error(GSS_ROUTINE_ERROR(status_value))); routine_error(GSS_ROUTINE_ERROR(status_value)));
if (buf == NULL) if (buf == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
}
} else if (status_type == GSS_C_MECH_CODE) { } else if (status_type == GSS_C_MECH_CODE) {
buf = strdup(krb5_get_err_text (gssapi_krb5_context, status_value)); buf = strdup(krb5_get_err_text (gssapi_krb5_context, status_value));
if (buf == NULL) if (buf == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
}
} else } else
return GSS_S_BAD_STATUS; return GSS_S_BAD_STATUS;

329
lib/gssapi/krb5/init_sec_context.c
View File

@@ -57,197 +57,208 @@ init_auth
OM_uint32 * time_rec OM_uint32 * time_rec
) )
{ {
OM_uint32 ret; OM_uint32 ret;
krb5_error_code kret; krb5_error_code kret;
krb5_flags ap_options; krb5_flags ap_options;
krb5_creds this_cred, *cred; krb5_creds this_cred, *cred;
krb5_data outbuf; krb5_data outbuf;
krb5_ccache ccache; krb5_ccache ccache;
u_int32_t flags; u_int32_t flags;
Authenticator *auth; Authenticator *auth;
krb5_data authenticator; krb5_data authenticator;
Checksum cksum; Checksum cksum;
krb5_enctype enctype; krb5_enctype enctype;
outbuf.length = 0; outbuf.length = 0;
outbuf.data = NULL; outbuf.data = NULL;
*minor_status = 0;
*context_handle = malloc(sizeof(**context_handle));
if (*context_handle == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
(*context_handle)->auth_context = NULL;
(*context_handle)->source = NULL;
(*context_handle)->target = NULL;
(*context_handle)->flags = 0;
(*context_handle)->more_flags = 0;
*context_handle = malloc(sizeof(**context_handle)); kret = krb5_auth_con_init (gssapi_krb5_context,
if (*context_handle == NULL) &(*context_handle)->auth_context);
return GSS_S_FAILURE; if (kret) {
*minor_status = kret;
ret = GSS_S_FAILURE;
goto failure;
}
(*context_handle)->auth_context = NULL; {
(*context_handle)->source = NULL; int32_t tmp;
(*context_handle)->target = NULL;
(*context_handle)->flags = 0;
(*context_handle)->more_flags = 0;
kret = krb5_auth_con_init (gssapi_krb5_context, krb5_auth_con_getflags(gssapi_krb5_context,
&(*context_handle)->auth_context); (*context_handle)->auth_context,
if (kret) { &tmp);
ret = GSS_S_FAILURE; tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE;
goto failure; krb5_auth_con_setflags(gssapi_krb5_context,
} (*context_handle)->auth_context,
tmp);
}
{ if (actual_mech_type)
int32_t tmp; *actual_mech_type = GSS_KRB5_MECHANISM;
krb5_auth_con_getflags(gssapi_krb5_context, flags = 0;
(*context_handle)->auth_context, ap_options = 0;
&tmp); if (req_flags & GSS_C_DELEG_FLAG)
tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE; ; /* XXX */
krb5_auth_con_setflags(gssapi_krb5_context, if (req_flags & GSS_C_MUTUAL_FLAG) {
(*context_handle)->auth_context, flags |= GSS_C_MUTUAL_FLAG;
tmp); ap_options |= AP_OPTS_MUTUAL_REQUIRED;
} }
if (req_flags & GSS_C_REPLAY_FLAG)
; /* XXX */
if (req_flags & GSS_C_SEQUENCE_FLAG)
; /* XXX */
if (req_flags & GSS_C_ANON_FLAG)
; /* XXX */
flags |= GSS_C_CONF_FLAG;
flags |= GSS_C_INTEG_FLAG;
flags |= GSS_C_SEQUENCE_FLAG;
if (actual_mech_type) if (ret_flags)
*actual_mech_type = GSS_KRB5_MECHANISM; *ret_flags = flags;
(*context_handle)->flags = flags;
(*context_handle)->more_flags = LOCAL;
flags = 0; kret = krb5_cc_default (gssapi_krb5_context, &ccache);
ap_options = 0; if (kret) {
if (req_flags & GSS_C_DELEG_FLAG) *minor_status = kret;
; /* XXX */ ret = GSS_S_FAILURE;
if (req_flags & GSS_C_MUTUAL_FLAG) { goto failure;
flags |= GSS_C_MUTUAL_FLAG; }
ap_options |= AP_OPTS_MUTUAL_REQUIRED;
}
if (req_flags & GSS_C_REPLAY_FLAG)
; /* XXX */
if (req_flags & GSS_C_SEQUENCE_FLAG)
; /* XXX */
if (req_flags & GSS_C_ANON_FLAG)
; /* XXX */
flags |= GSS_C_CONF_FLAG;
flags |= GSS_C_INTEG_FLAG;
flags |= GSS_C_SEQUENCE_FLAG;
if (ret_flags) kret = krb5_cc_get_principal (gssapi_krb5_context,
*ret_flags = flags; ccache,
(*context_handle)->flags = flags; &(*context_handle)->source);
(*context_handle)->more_flags = LOCAL; if (kret) {
*minor_status = kret;
ret = GSS_S_FAILURE;
goto failure;
}
kret = krb5_cc_default (gssapi_krb5_context, &ccache); kret = krb5_copy_principal (gssapi_krb5_context,
if (kret) { target_name,
ret = GSS_S_FAILURE; &(*context_handle)->target);
goto failure; if (kret) {
} *minor_status = kret;
ret = GSS_S_FAILURE;
goto failure;
}
kret = krb5_cc_get_principal (gssapi_krb5_context, memset(&this_cred, 0, sizeof(this_cred));
ccache, this_cred.client = (*context_handle)->source;
&(*context_handle)->source); this_cred.server = (*context_handle)->target;
if (kret) { this_cred.times.endtime = 0;
ret = GSS_S_FAILURE; this_cred.session.keytype = ETYPE_DES_CBC_CRC;
goto failure;
}
kret = krb5_copy_principal (gssapi_krb5_context,
target_name,
&(*context_handle)->target);
if (kret) {
ret = GSS_S_FAILURE;
goto failure;
}
memset(&this_cred, 0, sizeof(this_cred));
this_cred.client = (*context_handle)->source;
this_cred.server = (*context_handle)->target;
this_cred.times.endtime = 0;
this_cred.session.keytype = KEYTYPE_DES;
kret = krb5_get_credentials (gssapi_krb5_context, kret = krb5_get_credentials (gssapi_krb5_context,
KRB5_TC_MATCH_KEYTYPE, KRB5_TC_MATCH_KEYTYPE,
ccache, ccache,
&this_cred, &this_cred,
&cred); &cred);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; *minor_status = kret;
goto failure; ret = GSS_S_FAILURE;
} goto failure;
}
krb5_auth_con_setkey(gssapi_krb5_context, krb5_auth_con_setkey(gssapi_krb5_context,
(*context_handle)->auth_context, (*context_handle)->auth_context,
&cred->session); &cred->session);
kret = gssapi_krb5_create_8003_checksum (input_chan_bindings, kret = gssapi_krb5_create_8003_checksum (input_chan_bindings,
flags, flags,
&cksum); &cksum);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; *minor_status = kret;
goto failure; ret = GSS_S_FAILURE;
} goto failure;
}
#if 1 #if 1
enctype = (*context_handle)->auth_context->keyblock->keytype; enctype = (*context_handle)->auth_context->keyblock->keytype;
#else #else
if ((*context_handle)->auth_context->enctype) if ((*context_handle)->auth_context->enctype)
enctype = (*context_handle)->auth_context->enctype; enctype = (*context_handle)->auth_context->enctype;
else { else {
kret = krb5_keytype_to_enctype(gssapi_krb5_context, kret = krb5_keytype_to_enctype(gssapi_krb5_context,
(*context_handle)->auth_context->keyblock->keytype, (*context_handle)->auth_context->keyblock->keytype,
&enctype); &enctype);
if (kret) if (kret)
return kret; return kret;
} }
#endif #endif
kret = krb5_build_authenticator (gssapi_krb5_context, kret = krb5_build_authenticator (gssapi_krb5_context,
(*context_handle)->auth_context, (*context_handle)->auth_context,
enctype, enctype,
cred, cred,
&cksum, &cksum,
&auth, &auth,
&authenticator); &authenticator);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; *minor_status = kret;
goto failure; ret = GSS_S_FAILURE;
} goto failure;
}
kret = krb5_build_ap_req (gssapi_krb5_context, kret = krb5_build_ap_req (gssapi_krb5_context,
enctype, enctype,
cred, cred,
ap_options, ap_options,
authenticator, authenticator,
&outbuf); &outbuf);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; *minor_status = kret;
goto failure; ret = GSS_S_FAILURE;
} goto failure;
}
ret = gssapi_krb5_encapsulate (&outbuf, ret = gssapi_krb5_encapsulate (&outbuf,
output_token, output_token,
"\x01\x00"); "\x01\x00");
if (ret) if (ret) {
goto failure; *minor_status = kret;
goto failure;
}
if (flags & GSS_C_MUTUAL_FLAG) { if (flags & GSS_C_MUTUAL_FLAG) {
return GSS_S_CONTINUE_NEEDED; return GSS_S_CONTINUE_NEEDED;
} else { } else {
(*context_handle)->more_flags |= OPEN; (*context_handle)->more_flags |= OPEN;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }
failure: failure:
krb5_auth_con_free (gssapi_krb5_context, krb5_auth_con_free (gssapi_krb5_context,
(*context_handle)->auth_context); (*context_handle)->auth_context);
if((*context_handle)->source) if((*context_handle)->source)
krb5_free_principal (gssapi_krb5_context, krb5_free_principal (gssapi_krb5_context,
(*context_handle)->source); (*context_handle)->source);
if((*context_handle)->target) if((*context_handle)->target)
krb5_free_principal (gssapi_krb5_context, krb5_free_principal (gssapi_krb5_context,
(*context_handle)->target); (*context_handle)->target);
free (*context_handle); free (*context_handle);
krb5_data_free (&outbuf); krb5_data_free (&outbuf);
*context_handle = GSS_C_NO_CONTEXT; *context_handle = GSS_C_NO_CONTEXT;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
static OM_uint32 static OM_uint32