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

gssapi/sanon: Sprinkle const and rk_UNCONST.

Browse Source
This commit is contained in:
Taylor R Campbell
2023-06-20 11:00:35 +00:00
committed by Nicolas Williams
parent bbf6150cfd
commit cdd1fb8fc4
10 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gssapi/sanon/canonicalize_name.c
View File

@@ -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;
}

2
lib/gssapi/sanon/context_time.c
View File

@@ -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;

18
lib/gssapi/sanon/crypto.c
View File

@@ -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;

2
lib/gssapi/sanon/duplicate_cred.c
View File

@@ -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;
}

2
lib/gssapi/sanon/duplicate_name.c
View File

@@ -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;
}

2
lib/gssapi/sanon/inquire_context.c
View File

@@ -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;

2
lib/gssapi/sanon/inquire_cred.c
View File

@@ -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)

2
lib/gssapi/sanon/inquire_sec_context_by_oid.c
View File

@@ -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;

2
lib/gssapi/sanon/negoex.c
View File

@@ -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)
{

1
lib/gssapi/sanon/sanon_locl.h
View File

@@ -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;