Rename gss_context_id_t and gss_cred_id_t to local names

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17699 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-06-28 08:58:17 +00:00
parent a1321d12ed
commit 534d628c29
7 changed files with 294 additions and 182 deletions

View File

@@ -40,26 +40,30 @@ OM_uint32 gss_spnego_process_context_token
const gss_buffer_t token_buffer
)
{
gss_ctx_id_t context ;
gssspnego_ctx ctx;
OM_uint32 ret;
if (context_handle == GSS_C_NO_CONTEXT) {
if (context_handle == GSS_C_NO_CONTEXT)
return GSS_S_NO_CONTEXT;
}
HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex);
context = context_handle;
ctx = (gssspnego_ctx)context_handle;
HEIMDAL_MUTEX_lock(&ctx->ctx_id_mutex);
ret = gss_process_context_token(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
token_buffer);
if (ret != GSS_S_COMPLETE) {
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
HEIMDAL_MUTEX_unlock(&ctx->ctx_id_mutex);
return ret;
}
context_handle->negotiated_ctx_id = GSS_C_NO_CONTEXT;
ctx->negotiated_ctx_id = GSS_C_NO_CONTEXT;
return _gss_spnego_delete_sec_context(minor_status,
(gss_ctx_id_t *)&context_handle,
&context,
GSS_C_NO_BUFFER);
}
@@ -69,10 +73,14 @@ OM_uint32 gss_spnego_delete_sec_context
gss_buffer_t output_token
)
{
gssspnego_ctx ctx;
if (context_handle == NULL || *context_handle == GSS_C_NO_CONTEXT)
return GSS_S_NO_CONTEXT;
HEIMDAL_MUTEX_lock(&(*context_handle)->ctx_id_mutex);
ctx = (gssspnego_ctx)*context_handle;
HEIMDAL_MUTEX_lock(&ctx->ctx_id_mutex);
return _gss_spnego_delete_sec_context(minor_status,
context_handle,
@@ -85,18 +93,21 @@ OM_uint32 gss_spnego_context_time
OM_uint32 *time_rec
)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_context_time(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
time_rec);
}
@@ -108,17 +119,21 @@ OM_uint32 gss_spnego_get_mic
gss_buffer_t message_token
)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_get_mic(minor_status, context_handle->negotiated_ctx_id,
return gss_get_mic(minor_status, ctx->negotiated_ctx_id,
qop_req, message_buffer, message_token);
}
@@ -130,18 +145,22 @@ OM_uint32 gss_spnego_verify_mic
gss_qop_t * qop_state
)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_verify_mic(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
message_buffer,
token_buffer,
qop_state);
@@ -157,18 +176,22 @@ OM_uint32 gss_spnego_wrap
gss_buffer_t output_message_buffer
)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_wrap(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
conf_req_flag,
qop_req,
input_message_buffer,
@@ -185,25 +208,28 @@ OM_uint32 gss_spnego_unwrap
gss_qop_t * qop_state
)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_unwrap(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
input_message_buffer,
output_message_buffer,
conf_state,
qop_state);
}
#if 0
OM_uint32 gss_spnego_display_status
(OM_uint32 * minor_status,
OM_uint32 status_value,
@@ -215,7 +241,6 @@ OM_uint32 gss_spnego_display_status
{
return GSS_S_FAILURE;
}
#endif
OM_uint32 gss_spnego_indicate_mechs
(OM_uint32 * minor_status,
@@ -299,18 +324,22 @@ OM_uint32 gss_spnego_inquire_context (
int * open_context
)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_inquire_context(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
src_name,
targ_name,
lifetime_rec,
@@ -329,18 +358,22 @@ OM_uint32 gss_spnego_wrap_size_limit (
OM_uint32 * max_input_size
)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_wrap_size_limit(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
conf_req_flag,
qop_req,
req_output_size,
@@ -353,7 +386,7 @@ OM_uint32 gss_spnego_export_sec_context (
gss_buffer_t interprocess_token
)
{
gss_ctx_id_t ctx;
gssspnego_ctx ctx;
OM_uint32 ret;
*minor_status = 0;
@@ -362,11 +395,10 @@ OM_uint32 gss_spnego_export_sec_context (
return GSS_S_NO_CONTEXT;
}
ctx = *context_handle;
ctx = (gssspnego_ctx)*context_handle;
if (ctx == GSS_C_NO_CONTEXT) {
if (ctx == NULL)
return GSS_S_NO_CONTEXT;
}
HEIMDAL_MUTEX_lock(&ctx->ctx_id_mutex);
@@ -380,12 +412,10 @@ OM_uint32 gss_spnego_export_sec_context (
interprocess_token);
if (ret == GSS_S_COMPLETE) {
ret = _gss_spnego_delete_sec_context(minor_status,
&ctx,
context_handle,
GSS_C_NO_BUFFER);
if (ret == GSS_S_COMPLETE) {
*context_handle = GSS_C_NO_CONTEXT;
if (ret == GSS_S_COMPLETE)
return GSS_S_COMPLETE;
}
}
HEIMDAL_MUTEX_unlock(&ctx->ctx_id_mutex);
@@ -400,12 +430,14 @@ OM_uint32 gss_spnego_import_sec_context (
)
{
OM_uint32 ret, minor;
gss_ctx_id_t ctx;
gss_ctx_id_t context;
gssspnego_ctx ctx;
ret = _gss_spnego_alloc_sec_context(minor_status, &ctx);
ret = _gss_spnego_alloc_sec_context(minor_status, &context);
if (ret != GSS_S_COMPLETE) {
return ret;
}
ctx = (gssspnego_ctx)context;
HEIMDAL_MUTEX_lock(&ctx->ctx_id_mutex);
@@ -413,7 +445,7 @@ OM_uint32 gss_spnego_import_sec_context (
interprocess_token,
&ctx->negotiated_ctx_id);
if (ret != GSS_S_COMPLETE) {
_gss_spnego_delete_sec_context(&minor, &ctx, GSS_C_NO_BUFFER);
_gss_spnego_delete_sec_context(&minor, context_handle, GSS_C_NO_BUFFER);
return ret;
}
@@ -422,6 +454,8 @@ OM_uint32 gss_spnego_import_sec_context (
HEIMDAL_MUTEX_unlock(&ctx->ctx_id_mutex);
*context_handle = (gss_ctx_id_t)ctx;
return GSS_S_COMPLETE;
}
@@ -434,6 +468,27 @@ OM_uint32 gss_spnego_inquire_names_for_mech (
return gss_create_empty_oid_set(minor_status, name_types);
}
OM_uint32 gss_spnego_inquire_mechs_for_name (
OM_uint32 * minor_status,
const gss_name_t input_name,
gss_OID_set * mech_types
)
{
OM_uint32 ret, junk;
ret = gss_create_empty_oid_set(minor_status, mech_types);
if (ret)
return ret;
ret = gss_add_oid_set_member(minor_status,
GSS_SPNEGO_MECHANISM,
mech_types);
if (ret)
gss_release_oid_set(&junk, mech_types);
return ret;
}
OM_uint32 gss_spnego_canonicalize_name (
OM_uint32 * minor_status,
const gss_name_t input_name,
@@ -464,18 +519,22 @@ OM_uint32 gss_spnego_sign
gss_buffer_t message_token
)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_sign(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
qop_req,
message_buffer,
message_token);
@@ -489,18 +548,22 @@ OM_uint32 gss_spnego_verify
int * qop_state
)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_verify(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
message_buffer,
token_buffer,
qop_state);
@@ -516,18 +579,22 @@ OM_uint32 gss_spnego_seal
gss_buffer_t output_message_buffer
)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_seal(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
conf_req_flag,
qop_req,
input_message_buffer,
@@ -544,24 +611,29 @@ OM_uint32 gss_spnego_unseal
int * qop_state
)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_unseal(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
input_message_buffer,
output_message_buffer,
conf_state,
qop_state);
}
#if 0
OM_uint32 gss_spnego_unwrap_ex
(OM_uint32 * minor_status,
const gss_ctx_id_t context_handle,
@@ -572,18 +644,22 @@ OM_uint32 gss_spnego_unwrap_ex
int * conf_state,
gss_qop_t * qop_state)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_unwrap_ex(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
token_header_buffer,
associated_data_buffer,
input_message_buffer,
@@ -604,24 +680,28 @@ OM_uint32 gss_spnego_wrap_ex
gss_buffer_t output_message_buffer
)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if ((context_handle->mech_flags & GSS_C_DCE_STYLE) == 0 &&
if ((ctx->mech_flags & GSS_C_DCE_STYLE) == 0 &&
associated_data_buffer->length != input_message_buffer->length) {
*minor_status = EINVAL;
return GSS_S_BAD_QOP;
}
return gss_wrap_ex(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
conf_req_flag,
qop_req,
associated_data_buffer,
@@ -636,20 +716,25 @@ OM_uint32 gss_spnego_complete_auth_token
const gss_ctx_id_t context_handle,
gss_buffer_t input_message_buffer)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_complete_auth_token(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
input_message_buffer);
}
#endif
OM_uint32 gss_spnego_inquire_sec_context_by_oid
(OM_uint32 * minor_status,
@@ -657,18 +742,22 @@ OM_uint32 gss_spnego_inquire_sec_context_by_oid
const gss_OID desired_object,
gss_buffer_set_t *data_set)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if (context_handle->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_inquire_sec_context_by_oid(minor_status,
context_handle->negotiated_ctx_id,
ctx->negotiated_ctx_id,
desired_object,
data_set);
}
@@ -679,18 +768,22 @@ OM_uint32 gss_spnego_set_sec_context_option
const gss_OID desired_object,
const gss_buffer_t value)
{
gssspnego_ctx ctx;
*minor_status = 0;
if (context_handle == NULL || *context_handle == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
if ((*context_handle)->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
ctx = (gssspnego_ctx)context_handle;
if (ctx->negotiated_ctx_id == GSS_C_NO_CONTEXT) {
return GSS_S_NO_CONTEXT;
}
return gss_set_sec_context_option(minor_status,
&(*context_handle)->negotiated_ctx_id,
&ctx->negotiated_ctx_id,
desired_object,
value);
}