From cdd1fb8fc4485142ca38e34e349e72f5b9f5322f Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Tue, 20 Jun 2023 11:00:35 +0000 Subject: [PATCH] gssapi/sanon: Sprinkle const and rk_UNCONST. --- lib/gssapi/sanon/canonicalize_name.c | 2 +- lib/gssapi/sanon/context_time.c | 2 +- lib/gssapi/sanon/crypto.c | 18 +++++++++--------- lib/gssapi/sanon/duplicate_cred.c | 2 +- lib/gssapi/sanon/duplicate_name.c | 2 +- lib/gssapi/sanon/inquire_context.c | 2 +- lib/gssapi/sanon/inquire_cred.c | 2 +- lib/gssapi/sanon/inquire_sec_context_by_oid.c | 2 +- lib/gssapi/sanon/negoex.c | 2 +- lib/gssapi/sanon/sanon_locl.h | 1 + 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/gssapi/sanon/canonicalize_name.c b/lib/gssapi/sanon/canonicalize_name.c index fa1ade0ce..79ec9696c 100644 --- a/lib/gssapi/sanon/canonicalize_name.c +++ b/lib/gssapi/sanon/canonicalize_name.c @@ -42,7 +42,7 @@ _gss_sanon_canonicalize_name(OM_uint32 *minor, if (src_name == GSS_C_NO_NAME) return GSS_S_BAD_NAME; - *dest_name = (gss_name_t)src_name; + *dest_name = (gss_name_t)rk_UNCONST(src_name); return GSS_S_COMPLETE; } diff --git a/lib/gssapi/sanon/context_time.c b/lib/gssapi/sanon/context_time.c index 338f3acfd..ce5d25a38 100644 --- a/lib/gssapi/sanon/context_time.c +++ b/lib/gssapi/sanon/context_time.c @@ -38,7 +38,7 @@ _gss_sanon_context_time(OM_uint32 *minor, gss_const_ctx_id_t context_handle, OM_uint32 *time_rec) { - const sanon_ctx sc = (const sanon_ctx)context_handle; + sanon_const_ctx sc = (sanon_const_ctx)context_handle; *minor = 0; *time_rec = GSS_C_INDEFINITE; diff --git a/lib/gssapi/sanon/crypto.c b/lib/gssapi/sanon/crypto.c index 298fb411f..85599cb35 100644 --- a/lib/gssapi/sanon/crypto.c +++ b/lib/gssapi/sanon/crypto.c @@ -40,7 +40,7 @@ _gss_sanon_wrap(OM_uint32 *minor, int *conf_state, gss_buffer_t output_message_buffer) { - const sanon_ctx sc = (const sanon_ctx)context_handle; + sanon_const_ctx sc = (sanon_const_ctx)context_handle; if (sc->rfc4121 == GSS_C_NO_CONTEXT) { *minor = GSS_KRB5_S_KG_CTX_INCOMPLETE; @@ -61,7 +61,7 @@ _gss_sanon_wrap_size_limit(OM_uint32 *minor, OM_uint32 req_output_size, OM_uint32 *max_input_size) { - const sanon_ctx sc = (const sanon_ctx)context_handle; + sanon_const_ctx sc = (sanon_const_ctx)context_handle; if (sc->rfc4121 == GSS_C_NO_CONTEXT) { *minor = GSS_KRB5_S_KG_CTX_INCOMPLETE; @@ -82,7 +82,7 @@ _gss_sanon_wrap_iov(OM_uint32 *minor, gss_iov_buffer_desc *iov, int iov_count) { - const sanon_ctx sc = (const sanon_ctx)context_handle; + sanon_const_ctx sc = (sanon_const_ctx)context_handle; if (sc->rfc4121 == GSS_C_NO_CONTEXT) { *minor = GSS_KRB5_S_KG_CTX_INCOMPLETE; @@ -103,7 +103,7 @@ _gss_sanon_wrap_iov_length(OM_uint32 *minor, gss_iov_buffer_desc *iov, int iov_count) { - const sanon_ctx sc = (const sanon_ctx)context_handle; + sanon_const_ctx sc = (sanon_const_ctx)context_handle; if (sc->rfc4121 == GSS_C_NO_CONTEXT) { *minor = GSS_KRB5_S_KG_CTX_INCOMPLETE; @@ -123,7 +123,7 @@ _gss_sanon_unwrap(OM_uint32 *minor, int *conf_state, gss_qop_t * qop_state) { - const sanon_ctx sc = (const sanon_ctx)context_handle; + sanon_const_ctx sc = (sanon_const_ctx)context_handle; if (sc->rfc4121 == GSS_C_NO_CONTEXT) { *minor = GSS_KRB5_S_KG_CTX_INCOMPLETE; @@ -143,7 +143,7 @@ _gss_sanon_unwrap_iov(OM_uint32 *minor, gss_iov_buffer_desc *iov, int iov_count) { - const sanon_ctx sc = (const sanon_ctx)context_handle; + sanon_const_ctx sc = (sanon_const_ctx)context_handle; if (sc->rfc4121 == GSS_C_NO_CONTEXT) { *minor = GSS_KRB5_S_KG_CTX_INCOMPLETE; @@ -162,7 +162,7 @@ _gss_sanon_get_mic(OM_uint32 *minor, const gss_buffer_t message_buffer, gss_buffer_t message_token) { - const sanon_ctx sc = (const sanon_ctx)context_handle; + sanon_const_ctx sc = (sanon_const_ctx)context_handle; if (sc->rfc4121 == GSS_C_NO_CONTEXT) { *minor = GSS_KRB5_S_KG_CTX_INCOMPLETE; @@ -181,7 +181,7 @@ _gss_sanon_verify_mic(OM_uint32 *minor, const gss_buffer_t token_buffer, gss_qop_t *qop_state) { - const sanon_ctx sc = (const sanon_ctx)context_handle; + sanon_const_ctx sc = (sanon_const_ctx)context_handle; if (sc->rfc4121 == GSS_C_NO_CONTEXT) { *minor = GSS_KRB5_S_KG_CTX_INCOMPLETE; @@ -201,7 +201,7 @@ _gss_sanon_pseudo_random(OM_uint32 *minor, ssize_t desired_output_len, gss_buffer_t prf_out) { - const sanon_ctx sc = (const sanon_ctx)context_handle; + sanon_const_ctx sc = (sanon_const_ctx)context_handle; if (sc->rfc4121 == GSS_C_NO_CONTEXT) { *minor = GSS_KRB5_S_KG_CTX_INCOMPLETE; diff --git a/lib/gssapi/sanon/duplicate_cred.c b/lib/gssapi/sanon/duplicate_cred.c index 8c5c5d863..8b8a8d5d4 100644 --- a/lib/gssapi/sanon/duplicate_cred.c +++ b/lib/gssapi/sanon/duplicate_cred.c @@ -37,7 +37,7 @@ _gss_sanon_duplicate_cred(OM_uint32 *minor, gss_cred_id_t *output_cred_handle) { *minor = 0; - *output_cred_handle = (gss_cred_id_t)input_cred_handle; + *output_cred_handle = (gss_cred_id_t)rk_UNCONST(input_cred_handle); return GSS_S_COMPLETE; } diff --git a/lib/gssapi/sanon/duplicate_name.c b/lib/gssapi/sanon/duplicate_name.c index 698e83dc8..ae6c14a1a 100644 --- a/lib/gssapi/sanon/duplicate_name.c +++ b/lib/gssapi/sanon/duplicate_name.c @@ -37,7 +37,7 @@ _gss_sanon_duplicate_name(OM_uint32 *minor, gss_name_t *dest_name) { *minor = 0; - *dest_name = (gss_name_t)src_name; + *dest_name = (gss_name_t)rk_UNCONST(src_name); return GSS_S_COMPLETE; } diff --git a/lib/gssapi/sanon/inquire_context.c b/lib/gssapi/sanon/inquire_context.c index f5aa727b5..d20423b1a 100644 --- a/lib/gssapi/sanon/inquire_context.c +++ b/lib/gssapi/sanon/inquire_context.c @@ -42,7 +42,7 @@ _gss_sanon_inquire_context(OM_uint32 *minor, int *locally_initiated, int *open_context) { - const sanon_ctx sc = (const sanon_ctx)context_handle; + sanon_const_ctx sc = (sanon_const_ctx)context_handle; OM_uint32 major = GSS_S_COMPLETE; *minor = 0; diff --git a/lib/gssapi/sanon/inquire_cred.c b/lib/gssapi/sanon/inquire_cred.c index b25ff2ffb..0e5524345 100644 --- a/lib/gssapi/sanon/inquire_cred.c +++ b/lib/gssapi/sanon/inquire_cred.c @@ -46,7 +46,7 @@ _gss_sanon_inquire_cred(OM_uint32 *minor, /* the credential handle is a reference to the cred name */ if (name_ret) - *name_ret = (gss_name_t)cred_handle; + *name_ret = (gss_name_t)rk_UNCONST(cred_handle); if (lifetime) *lifetime = GSS_C_INDEFINITE; if (cred_usage) diff --git a/lib/gssapi/sanon/inquire_sec_context_by_oid.c b/lib/gssapi/sanon/inquire_sec_context_by_oid.c index 1d8bc4b10..064cc2559 100644 --- a/lib/gssapi/sanon/inquire_sec_context_by_oid.c +++ b/lib/gssapi/sanon/inquire_sec_context_by_oid.c @@ -37,7 +37,7 @@ _gss_sanon_inquire_sec_context_by_oid(OM_uint32 *minor, const gss_OID desired_object, gss_buffer_set_t *data_set) { - const sanon_ctx sc = (const sanon_ctx)context_handle; + sanon_const_ctx sc = (sanon_const_ctx)context_handle; if (sc == NULL) return GSS_S_NO_CONTEXT; diff --git a/lib/gssapi/sanon/negoex.c b/lib/gssapi/sanon/negoex.c index c6a21dd2b..10574de58 100644 --- a/lib/gssapi/sanon/negoex.c +++ b/lib/gssapi/sanon/negoex.c @@ -50,7 +50,7 @@ _gssspi_sanon_query_mechanism_info(OM_uint32 *minor, OM_uint32 _gss_sanon_inquire_negoex_key(OM_uint32 *minor, - const sanon_ctx sc, + sanon_const_ctx sc, gss_const_OID desired_object, gss_buffer_set_t *data_set) { diff --git a/lib/gssapi/sanon/sanon_locl.h b/lib/gssapi/sanon/sanon_locl.h index 9f8577d24..ab9738025 100644 --- a/lib/gssapi/sanon/sanon_locl.h +++ b/lib/gssapi/sanon/sanon_locl.h @@ -53,6 +53,7 @@ typedef struct sanon_ctx_desc { gss_ctx_id_t rfc4121; unsigned is_initiator : 1; } *sanon_ctx; +typedef const struct sanon_ctx_desc *sanon_const_ctx; extern gss_name_t _gss_sanon_anonymous_identity; extern gss_name_t _gss_sanon_non_anonymous_identity;