From 34dc2dda5726afb02f180acd433650353dcab9e7 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Tue, 20 Jun 2023 10:17:14 +0000 Subject: [PATCH] gssapi/mech: Sprinkle const and rk_UNCONST. --- lib/gssapi/gssapi_mech.h | 2 +- lib/gssapi/mech/context.c | 2 +- lib/gssapi/mech/gss_accept_sec_context.c | 3 ++- lib/gssapi/mech/gss_acquire_cred_from.c | 2 +- lib/gssapi/mech/gss_add_cred_from.c | 2 +- lib/gssapi/mech/gss_authorize_localname.c | 4 ++-- lib/gssapi/mech/gss_canonicalize_name.c | 2 +- lib/gssapi/mech/gss_compare_name.c | 4 ++-- lib/gssapi/mech/gss_context_time.c | 3 ++- lib/gssapi/mech/gss_display_name.c | 2 +- lib/gssapi/mech/gss_duplicate_cred.c | 2 +- lib/gssapi/mech/gss_duplicate_name.c | 2 +- lib/gssapi/mech/gss_export_name.c | 2 +- lib/gssapi/mech/gss_get_mic.c | 3 ++- lib/gssapi/mech/gss_get_neg_mechs.c | 2 +- lib/gssapi/mech/gss_init_sec_context.c | 8 ++++---- lib/gssapi/mech/gss_inquire_context.c | 3 ++- lib/gssapi/mech/gss_inquire_cred.c | 2 +- lib/gssapi/mech/gss_inquire_cred_by_mech.c | 3 ++- lib/gssapi/mech/gss_inquire_cred_by_oid.c | 2 +- lib/gssapi/mech/gss_inquire_mechs_for_name.c | 2 +- lib/gssapi/mech/gss_inquire_sec_context_by_oid.c | 3 ++- lib/gssapi/mech/gss_mech_switch.c | 5 +++-- lib/gssapi/mech/gss_pname_to_uid.c | 2 +- lib/gssapi/mech/gss_process_context_token.c | 3 ++- lib/gssapi/mech/gss_store_cred_into.c | 2 +- lib/gssapi/mech/gss_unwrap.c | 3 ++- lib/gssapi/mech/gss_verify_mic.c | 3 ++- lib/gssapi/mech/gss_wrap.c | 3 ++- lib/gssapi/mech/gss_wrap_size_limit.c | 3 ++- lib/gssapi/mech/gssspi_exchange_meta_data.c | 4 ++-- lib/gssapi/mech/gssspi_query_meta_data.c | 4 ++-- lib/gssapi/test_negoex_mech.c | 3 ++- 33 files changed, 54 insertions(+), 41 deletions(-) diff --git a/lib/gssapi/gssapi_mech.h b/lib/gssapi/gssapi_mech.h index 33261ef55..1fe1874fe 100644 --- a/lib/gssapi/gssapi_mech.h +++ b/lib/gssapi/gssapi_mech.h @@ -686,7 +686,7 @@ _gss_mg_log_name(int level, void _gss_mg_log_cred(int level, - struct _gss_cred *cred, + const struct _gss_cred *cred, const char *fmt, ...); diff --git a/lib/gssapi/mech/context.c b/lib/gssapi/mech/context.c index 83e2cef6a..de9d4099a 100644 --- a/lib/gssapi/mech/context.c +++ b/lib/gssapi/mech/context.c @@ -334,7 +334,7 @@ _gss_mg_log_name(int level, void _gss_mg_log_cred(int level, - struct _gss_cred *cred, + const struct _gss_cred *cred, const char *fmt, ...) { struct _gss_mechanism_cred *mc; diff --git a/lib/gssapi/mech/gss_accept_sec_context.c b/lib/gssapi/mech/gss_accept_sec_context.c index a4982a7b6..83394bb24 100644 --- a/lib/gssapi/mech/gss_accept_sec_context.c +++ b/lib/gssapi/mech/gss_accept_sec_context.c @@ -239,7 +239,8 @@ gss_accept_sec_context(OM_uint32 *minor_status, OM_uint32 major_status, mech_ret_flags, junk; gssapi_mech_interface m = NULL; struct _gss_context *ctx = (struct _gss_context *) *context_handle; - struct _gss_cred *cred = (struct _gss_cred *) acceptor_cred_handle; + const struct _gss_cred *cred = + (const struct _gss_cred *)acceptor_cred_handle; struct _gss_mechanism_cred *mc; gss_buffer_desc defective_token_error; gss_const_cred_id_t acceptor_mc; diff --git a/lib/gssapi/mech/gss_acquire_cred_from.c b/lib/gssapi/mech/gss_acquire_cred_from.c index 5bb956c57..a56a86cbe 100644 --- a/lib/gssapi/mech/gss_acquire_cred_from.c +++ b/lib/gssapi/mech/gss_acquire_cred_from.c @@ -145,7 +145,7 @@ gss_acquire_cred_from(OM_uint32 *minor_status, OM_uint32 *time_rec) { OM_uint32 major_status, minor; - struct _gss_name *name = (struct _gss_name *)desired_name; + struct _gss_name *name = rk_UNCONST(desired_name); gssapi_mech_interface m; struct _gss_cred *cred = NULL; size_t i; diff --git a/lib/gssapi/mech/gss_add_cred_from.c b/lib/gssapi/mech/gss_add_cred_from.c index 9f761e8a7..3d83037da 100644 --- a/lib/gssapi/mech/gss_add_cred_from.c +++ b/lib/gssapi/mech/gss_add_cred_from.c @@ -119,7 +119,7 @@ add_mech_cred_internal(OM_uint32 *minor_status, if (desired_name != GSS_C_NO_NAME) { major_status = _gss_find_mn(minor_status, - (struct _gss_name *)desired_name, + rk_UNCONST(desired_name), &m->gm_mech_oid, &mn); if (major_status != GSS_S_COMPLETE) return major_status; diff --git a/lib/gssapi/mech/gss_authorize_localname.c b/lib/gssapi/mech/gss_authorize_localname.c index b72b7bde8..a0efd38c6 100644 --- a/lib/gssapi/mech/gss_authorize_localname.c +++ b/lib/gssapi/mech/gss_authorize_localname.c @@ -85,7 +85,7 @@ attr_authorize_localname(OM_uint32 *minor_status, int authenticated = 0, complete = 0; tmpMajor = gss_get_name_attribute(minor_status, - (gss_name_t)name, + rk_UNCONST(name), GSS_C_ATTR_LOCAL_LOGIN_USER, &authenticated, &complete, @@ -171,7 +171,7 @@ gss_userok(gss_const_name_t name, gss_buffer_desc userBuf; gss_name_t userName; - userBuf.value = (void *)user; + userBuf.value = rk_UNCONST(user); userBuf.length = strlen(user); major_status = gss_import_name(&minor_status, &userBuf, diff --git a/lib/gssapi/mech/gss_canonicalize_name.c b/lib/gssapi/mech/gss_canonicalize_name.c index 859c6880e..679117ec6 100644 --- a/lib/gssapi/mech/gss_canonicalize_name.c +++ b/lib/gssapi/mech/gss_canonicalize_name.c @@ -61,7 +61,7 @@ gss_canonicalize_name(OM_uint32 *minor_status, gss_name_t *output_name) { OM_uint32 major_status; - struct _gss_name *name = (struct _gss_name *) input_name; + struct _gss_name *name = rk_UNCONST(input_name); struct _gss_mechanism_name *mn; gssapi_mech_interface m; gss_name_t new_canonical_name; diff --git a/lib/gssapi/mech/gss_compare_name.c b/lib/gssapi/mech/gss_compare_name.c index 9f4c1fac6..d6fbd44aa 100644 --- a/lib/gssapi/mech/gss_compare_name.c +++ b/lib/gssapi/mech/gss_compare_name.c @@ -36,8 +36,8 @@ gss_compare_name(OM_uint32 *minor_status, gss_const_name_t name2_arg, int *name_equal) { - struct _gss_name *name1 = (struct _gss_name *) name1_arg; - struct _gss_name *name2 = (struct _gss_name *) name2_arg; + struct _gss_name *name1 = rk_UNCONST(name1_arg); + struct _gss_name *name2 = rk_UNCONST(name2_arg); /* * First check the implementation-independent name if both diff --git a/lib/gssapi/mech/gss_context_time.c b/lib/gssapi/mech/gss_context_time.c index a5b646cf6..5231bdfcc 100644 --- a/lib/gssapi/mech/gss_context_time.c +++ b/lib/gssapi/mech/gss_context_time.c @@ -33,7 +33,8 @@ gss_context_time(OM_uint32 *minor_status, gss_const_ctx_id_t context_handle, OM_uint32 *time_rec) { - struct _gss_context *ctx = (struct _gss_context *) context_handle; + const struct _gss_context *ctx = + (const struct _gss_context *)context_handle; gssapi_mech_interface m = ctx->gc_mech; return (m->gm_context_time(minor_status, ctx->gc_ctx, time_rec)); diff --git a/lib/gssapi/mech/gss_display_name.c b/lib/gssapi/mech/gss_display_name.c index fadd68ba3..ac4ec257d 100644 --- a/lib/gssapi/mech/gss_display_name.c +++ b/lib/gssapi/mech/gss_display_name.c @@ -35,7 +35,7 @@ gss_display_name(OM_uint32 *minor_status, gss_OID *output_name_type) { OM_uint32 major_status; - struct _gss_name *name = (struct _gss_name *) input_name; + struct _gss_name *name = rk_UNCONST(input_name); struct _gss_mechanism_name *mn; _mg_buffer_zero(output_name_buffer); diff --git a/lib/gssapi/mech/gss_duplicate_cred.c b/lib/gssapi/mech/gss_duplicate_cred.c index 0c25ce9fa..bfebb0eb2 100644 --- a/lib/gssapi/mech/gss_duplicate_cred.c +++ b/lib/gssapi/mech/gss_duplicate_cred.c @@ -109,7 +109,7 @@ gss_duplicate_cred(OM_uint32 *minor_status, { struct _gss_mechanism_cred *mc; struct _gss_cred *new_cred; - struct _gss_cred *cred = (struct _gss_cred *)input_cred_handle; + const struct _gss_cred *cred = (const struct _gss_cred *)input_cred_handle; OM_uint32 major_status, junk; if (input_cred_handle == GSS_C_NO_CREDENTIAL) { diff --git a/lib/gssapi/mech/gss_duplicate_name.c b/lib/gssapi/mech/gss_duplicate_name.c index e8d1e323a..7cd97d5f6 100644 --- a/lib/gssapi/mech/gss_duplicate_name.c +++ b/lib/gssapi/mech/gss_duplicate_name.c @@ -34,7 +34,7 @@ gss_duplicate_name(OM_uint32 *minor_status, gss_name_t *dest_name) { OM_uint32 major_status; - struct _gss_name *name = (struct _gss_name *) src_name; + struct _gss_name *name = rk_UNCONST(src_name); struct _gss_name *new_name; struct _gss_mechanism_name *mn; diff --git a/lib/gssapi/mech/gss_export_name.c b/lib/gssapi/mech/gss_export_name.c index 92b7a8f1e..bc9428f95 100644 --- a/lib/gssapi/mech/gss_export_name.c +++ b/lib/gssapi/mech/gss_export_name.c @@ -49,7 +49,7 @@ gss_export_name(OM_uint32 *minor_status, gss_const_name_t input_name, gss_buffer_t exported_name) { - struct _gss_name *name = (struct _gss_name *) input_name; + const struct _gss_name *name = (const struct _gss_name *)input_name; struct _gss_mechanism_name *mn; _mg_buffer_zero(exported_name); diff --git a/lib/gssapi/mech/gss_get_mic.c b/lib/gssapi/mech/gss_get_mic.c index 8663053d4..6129d8cd0 100644 --- a/lib/gssapi/mech/gss_get_mic.c +++ b/lib/gssapi/mech/gss_get_mic.c @@ -35,7 +35,8 @@ gss_get_mic(OM_uint32 *minor_status, const gss_buffer_t message_buffer, gss_buffer_t message_token) { - struct _gss_context *ctx = (struct _gss_context *) context_handle; + const struct _gss_context *ctx = + (const struct _gss_context *)context_handle; gssapi_mech_interface m; _mg_buffer_zero(message_token); diff --git a/lib/gssapi/mech/gss_get_neg_mechs.c b/lib/gssapi/mech/gss_get_neg_mechs.c index cbc378639..f43e76683 100644 --- a/lib/gssapi/mech/gss_get_neg_mechs.c +++ b/lib/gssapi/mech/gss_get_neg_mechs.c @@ -37,7 +37,7 @@ gss_get_neg_mechs(OM_uint32 *minor_status, gss_const_cred_id_t cred_handle, gss_OID_set *mechs) { - struct _gss_cred *cred = (struct _gss_cred *)cred_handle; + const struct _gss_cred *cred = (const struct _gss_cred *)cred_handle; if (minor_status == NULL) return GSS_S_CALL_INACCESSIBLE_WRITE; diff --git a/lib/gssapi/mech/gss_init_sec_context.c b/lib/gssapi/mech/gss_init_sec_context.c index 6d28938ce..5d9c9ffee 100644 --- a/lib/gssapi/mech/gss_init_sec_context.c +++ b/lib/gssapi/mech/gss_init_sec_context.c @@ -35,7 +35,7 @@ _gss_mg_find_mech_cred( gss_const_cred_id_t cred_handle, gss_const_OID mech_type) { - struct _gss_cred *cred = (struct _gss_cred *)cred_handle; + const struct _gss_cred *cred = (const struct _gss_cred *)cred_handle; struct _gss_mechanism_cred *mc; if (cred == NULL) @@ -52,7 +52,7 @@ static void log_init_sec_context(struct _gss_context *ctx, struct _gss_name *target, OM_uint32 req_flags, - struct _gss_cred *cred, + const struct _gss_cred *cred, gss_OID mech_type, gss_buffer_t input_token) { @@ -159,7 +159,7 @@ gss_init_sec_context(OM_uint32 * minor_status, OM_uint32 major_status; gssapi_mech_interface m; gss_const_name_t mn_inner = GSS_C_NO_NAME; - struct _gss_name *name = (struct _gss_name *) target_name; + struct _gss_name *name = rk_UNCONST(target_name); struct _gss_mechanism_name *mn; struct _gss_context *ctx = (struct _gss_context *) *context_handle; gss_const_cred_id_t cred_handle; @@ -183,7 +183,7 @@ gss_init_sec_context(OM_uint32 * minor_status, if (_gss_mg_log_level(1)) log_init_sec_context(ctx, name, req_flags, - (struct _gss_cred *)initiator_cred_handle, + (const struct _gss_cred *)initiator_cred_handle, input_mech_type, input_token); /* diff --git a/lib/gssapi/mech/gss_inquire_context.c b/lib/gssapi/mech/gss_inquire_context.c index 614069688..2ca8490e3 100644 --- a/lib/gssapi/mech/gss_inquire_context.c +++ b/lib/gssapi/mech/gss_inquire_context.c @@ -40,7 +40,8 @@ gss_inquire_context(OM_uint32 *minor_status, int *xopen) { OM_uint32 major_status; - struct _gss_context *ctx = (struct _gss_context *) context_handle; + const struct _gss_context *ctx = + (const struct _gss_context *)context_handle; gssapi_mech_interface m; struct _gss_name *name; gss_name_t src_mn, targ_mn; diff --git a/lib/gssapi/mech/gss_inquire_cred.c b/lib/gssapi/mech/gss_inquire_cred.c index 305cae261..4e22772fb 100644 --- a/lib/gssapi/mech/gss_inquire_cred.c +++ b/lib/gssapi/mech/gss_inquire_cred.c @@ -52,7 +52,7 @@ gss_inquire_cred(OM_uint32 *minor_status, { OM_uint32 major_status; struct _gss_mech_switch *m; - struct _gss_cred *cred = (struct _gss_cred *) cred_handle; + const struct _gss_cred *cred = (const struct _gss_cred *)cred_handle; struct _gss_name *name; struct _gss_mechanism_name *mn; OM_uint32 min_lifetime; diff --git a/lib/gssapi/mech/gss_inquire_cred_by_mech.c b/lib/gssapi/mech/gss_inquire_cred_by_mech.c index 10ba9b7b8..4b266a67c 100644 --- a/lib/gssapi/mech/gss_inquire_cred_by_mech.c +++ b/lib/gssapi/mech/gss_inquire_cred_by_mech.c @@ -59,7 +59,8 @@ gss_inquire_cred_by_mech(OM_uint32 *minor_status, return (GSS_S_NO_CRED); if (cred_handle != GSS_C_NO_CREDENTIAL) { - struct _gss_cred *cred = (struct _gss_cred *) cred_handle; + const struct _gss_cred *cred = + (const struct _gss_cred *)cred_handle; HEIM_TAILQ_FOREACH(mcp, &cred->gc_mc, gmc_link) if (mcp->gmc_mech == m) break; diff --git a/lib/gssapi/mech/gss_inquire_cred_by_oid.c b/lib/gssapi/mech/gss_inquire_cred_by_oid.c index 4e7c73fa4..5ac3b40c4 100644 --- a/lib/gssapi/mech/gss_inquire_cred_by_oid.c +++ b/lib/gssapi/mech/gss_inquire_cred_by_oid.c @@ -38,7 +38,7 @@ gss_inquire_cred_by_oid (OM_uint32 *minor_status, const gss_OID desired_object, gss_buffer_set_t *data_set) { - struct _gss_cred *cred = (struct _gss_cred *) cred_handle; + const struct _gss_cred *cred = (const struct _gss_cred *)cred_handle; OM_uint32 status = GSS_S_COMPLETE; struct _gss_mechanism_cred *mc; gssapi_mech_interface m; diff --git a/lib/gssapi/mech/gss_inquire_mechs_for_name.c b/lib/gssapi/mech/gss_inquire_mechs_for_name.c index f75dbaab0..652f8e86f 100644 --- a/lib/gssapi/mech/gss_inquire_mechs_for_name.c +++ b/lib/gssapi/mech/gss_inquire_mechs_for_name.c @@ -34,7 +34,7 @@ gss_inquire_mechs_for_name(OM_uint32 *minor_status, gss_OID_set *mech_types) { OM_uint32 major_status; - struct _gss_name *name = (struct _gss_name *) input_name; + const struct _gss_name *name = (const struct _gss_name *)input_name; struct _gss_mech_switch *m; gss_OID_set name_types; int present; diff --git a/lib/gssapi/mech/gss_inquire_sec_context_by_oid.c b/lib/gssapi/mech/gss_inquire_sec_context_by_oid.c index 55ff67169..7306d6215 100644 --- a/lib/gssapi/mech/gss_inquire_sec_context_by_oid.c +++ b/lib/gssapi/mech/gss_inquire_sec_context_by_oid.c @@ -38,7 +38,8 @@ gss_inquire_sec_context_by_oid (OM_uint32 *minor_status, const gss_OID desired_object, gss_buffer_set_t *data_set) { - struct _gss_context *ctx = (struct _gss_context *) context_handle; + const struct _gss_context *ctx = + (const struct _gss_context *)context_handle; OM_uint32 major_status; gssapi_mech_interface m; diff --git a/lib/gssapi/mech/gss_mech_switch.c b/lib/gssapi/mech/gss_mech_switch.c index 245aaad81..436ceae2e 100644 --- a/lib/gssapi/mech/gss_mech_switch.c +++ b/lib/gssapi/mech/gss_mech_switch.c @@ -313,6 +313,7 @@ _gss_load_mech(void) while (fgets(buf, sizeof(buf), fp)) { _gss_mo_init *mi; + char *gm_name = NULL; if (*buf == '#') continue; @@ -355,7 +356,7 @@ _gss_load_mech(void) m->gm_so = so; m->gm_mech_oid = mech_oid; - m->gm_mech.gm_name = strdup(name); + m->gm_mech.gm_name = gm_name = strdup(name); m->gm_mech.gm_mech_oid = *mech_oid; m->gm_mech.gm_flags = 0; m->gm_mech.gm_compat = calloc(1, sizeof(struct gss_mech_compat_desc_struct)); @@ -462,7 +463,7 @@ _gss_load_mech(void) if (m != NULL) { free(m->gm_mech.gm_compat); /* do not free OID, it has been interned */ - free((char *)m->gm_mech.gm_name); + free(gm_name); free(m); } if (so != NULL) diff --git a/lib/gssapi/mech/gss_pname_to_uid.c b/lib/gssapi/mech/gss_pname_to_uid.c index 5046faed0..297df3e32 100644 --- a/lib/gssapi/mech/gss_pname_to_uid.c +++ b/lib/gssapi/mech/gss_pname_to_uid.c @@ -106,7 +106,7 @@ gss_localname(OM_uint32 *minor_status, gss_buffer_t localname) { OM_uint32 major_status = GSS_S_UNAVAILABLE; - struct _gss_name *name = (struct _gss_name *) pname; + struct _gss_name *name = rk_UNCONST(pname); struct _gss_mechanism_name *mn = NULL; *minor_status = 0; diff --git a/lib/gssapi/mech/gss_process_context_token.c b/lib/gssapi/mech/gss_process_context_token.c index d10eb47db..8700c6728 100644 --- a/lib/gssapi/mech/gss_process_context_token.c +++ b/lib/gssapi/mech/gss_process_context_token.c @@ -33,7 +33,8 @@ gss_process_context_token(OM_uint32 *minor_status, gss_const_ctx_id_t context_handle, const gss_buffer_t token_buffer) { - struct _gss_context *ctx = (struct _gss_context *) context_handle; + const struct _gss_context *ctx = + (const struct _gss_context *)context_handle; gssapi_mech_interface m = ctx->gc_mech; return (m->gm_process_context_token(minor_status, ctx->gc_ctx, diff --git a/lib/gssapi/mech/gss_store_cred_into.c b/lib/gssapi/mech/gss_store_cred_into.c index 1c739b056..ef6913973 100644 --- a/lib/gssapi/mech/gss_store_cred_into.c +++ b/lib/gssapi/mech/gss_store_cred_into.c @@ -88,7 +88,7 @@ gss_store_cred_into2(OM_uint32 *minor_status, gss_cred_usage_t *cred_usage_stored, gss_buffer_set_t *env) { - struct _gss_cred *cred = (struct _gss_cred *)input_cred_handle; + const struct _gss_cred *cred = (const struct _gss_cred *)input_cred_handle; struct _gss_mechanism_cred *mc; OM_uint32 major_status; OM_uint32 minor; diff --git a/lib/gssapi/mech/gss_unwrap.c b/lib/gssapi/mech/gss_unwrap.c index dd6363b0f..1fd49ad38 100644 --- a/lib/gssapi/mech/gss_unwrap.c +++ b/lib/gssapi/mech/gss_unwrap.c @@ -36,7 +36,8 @@ gss_unwrap(OM_uint32 *minor_status, int *conf_state, gss_qop_t *qop_state) { - struct _gss_context *ctx = (struct _gss_context *) context_handle; + const struct _gss_context *ctx = + (const struct _gss_context *)context_handle; gssapi_mech_interface m; if (conf_state) diff --git a/lib/gssapi/mech/gss_verify_mic.c b/lib/gssapi/mech/gss_verify_mic.c index ae3b52f72..07e2ca46c 100644 --- a/lib/gssapi/mech/gss_verify_mic.c +++ b/lib/gssapi/mech/gss_verify_mic.c @@ -35,7 +35,8 @@ gss_verify_mic(OM_uint32 *minor_status, const gss_buffer_t token_buffer, gss_qop_t *qop_state) { - struct _gss_context *ctx = (struct _gss_context *) context_handle; + const struct _gss_context *ctx = + (const struct _gss_context *)context_handle; gssapi_mech_interface m; if (qop_state) diff --git a/lib/gssapi/mech/gss_wrap.c b/lib/gssapi/mech/gss_wrap.c index 82378d3d0..606332697 100644 --- a/lib/gssapi/mech/gss_wrap.c +++ b/lib/gssapi/mech/gss_wrap.c @@ -52,7 +52,8 @@ gss_wrap(OM_uint32 *minor_status, int *conf_state, gss_buffer_t output_message_buffer) { - struct _gss_context *ctx = (struct _gss_context *) context_handle; + const struct _gss_context *ctx = + (const struct _gss_context *)context_handle; gssapi_mech_interface m; if (conf_state) diff --git a/lib/gssapi/mech/gss_wrap_size_limit.c b/lib/gssapi/mech/gss_wrap_size_limit.c index 3bcd9ecee..e6f213f8b 100644 --- a/lib/gssapi/mech/gss_wrap_size_limit.c +++ b/lib/gssapi/mech/gss_wrap_size_limit.c @@ -36,7 +36,8 @@ gss_wrap_size_limit(OM_uint32 *minor_status, OM_uint32 req_output_size, OM_uint32 *max_input_size) { - struct _gss_context *ctx = (struct _gss_context *) context_handle; + const struct _gss_context *ctx = + (const struct _gss_context *)context_handle; gssapi_mech_interface m; *max_input_size = 0; diff --git a/lib/gssapi/mech/gssspi_exchange_meta_data.c b/lib/gssapi/mech/gssspi_exchange_meta_data.c index fa98cbd73..5dc49f89c 100644 --- a/lib/gssapi/mech/gssspi_exchange_meta_data.c +++ b/lib/gssapi/mech/gssspi_exchange_meta_data.c @@ -41,9 +41,9 @@ gssspi_exchange_meta_data( { OM_uint32 major_status, junk; gssapi_mech_interface m; - struct _gss_name *name = (struct _gss_name *) target_name; + struct _gss_name *name = rk_UNCONST(target_name); struct _gss_mechanism_name *mn; - struct _gss_context *ctx = (struct _gss_context *) *context_handle; + struct _gss_context *ctx = rk_UNCONST(*context_handle); gss_cred_id_t cred_handle; int allocated_ctx; gss_const_OID mech_type = input_mech_type; diff --git a/lib/gssapi/mech/gssspi_query_meta_data.c b/lib/gssapi/mech/gssspi_query_meta_data.c index 490bbc9f0..9aff5eb4f 100644 --- a/lib/gssapi/mech/gssspi_query_meta_data.c +++ b/lib/gssapi/mech/gssspi_query_meta_data.c @@ -41,9 +41,9 @@ gssspi_query_meta_data( { OM_uint32 major_status, junk; gssapi_mech_interface m; - struct _gss_name *name = (struct _gss_name *) target_name; + struct _gss_name *name = rk_UNCONST(target_name); struct _gss_mechanism_name *mn; - struct _gss_context *ctx = (struct _gss_context *) *context_handle; + struct _gss_context *ctx = rk_UNCONST(*context_handle); gss_cred_id_t cred_handle; int allocated_ctx; gss_const_OID mech_type = input_mech_type; diff --git a/lib/gssapi/test_negoex_mech.c b/lib/gssapi/test_negoex_mech.c index 559c5dea6..213e23fdc 100644 --- a/lib/gssapi/test_negoex_mech.c +++ b/lib/gssapi/test_negoex_mech.c @@ -350,7 +350,8 @@ gss_inquire_sec_context_by_oid(OM_uint32 *minor_status, const gss_OID desired_object, gss_buffer_set_t *data_set) { - struct test_context *ctx = (struct test_context *)context_handle; + const struct test_context *ctx = + (const struct test_context *)context_handle; OM_uint32 major; uint8_t keybytes[32] = { 0 }; uint8_t typebytes[4];