jdk-sandbox: comparison src/java.security.jgss/share/native/libj2gss/gssapi.h

equal deleted inserted replaced

-:946f7f2d321c
+:74f0622db875
 /*
-* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 /*
 * POSIX says that sys/types.h is where size_t is defined.
 */
 #include <sys/types.h>
-typedef void * gss_name_t;
+struct gss_name_struct;
-typedef void * gss_cred_id_t;
+typedef struct gss_name_struct * gss_name_t;
-typedef void * gss_ctx_id_t;
+typedef const struct gss_name_struct *gss_const_name_t;
+struct gss_cred_id_struct;
+typedef struct gss_cred_id_struct * gss_cred_id_t;
+typedef const struct gss_cred_id_struct *gss_const_cred_id_t;
+struct gss_ctx_id_struct;
+typedef struct gss_ctx_id_struct * gss_ctx_id_t;
+typedef const struct gss_ctx_id_struct *gss_const_ctx_id_t;
 /*
 * The following type must be defined as the smallest natural unsigned integer
 * supported by the platform that has at least 32 bits of precision.
 */
 typedef struct gss_OID_desc_struct {
 OM_uint32 length;
 void *elements;
 } gss_OID_desc, *gss_OID;
+typedef const gss_OID_desc * gss_const_OID;
 typedef struct gss_OID_set_desc_struct  {
 size_t  count;
 gss_OID elements;
 } gss_OID_set_desc, *gss_OID_set;
+typedef const gss_OID_set_desc * gss_const_OID_set;
 typedef struct gss_buffer_desc_struct {
 size_t length;
 void *value;
 } gss_buffer_desc, *gss_buffer_t;
+typedef const gss_buffer_desc * gss_const_buffer_t;
 typedef struct gss_channel_bindings_struct {
 OM_uint32 initiator_addrtype;
 gss_buffer_desc initiator_address;
 OM_uint32 acceptor_addrtype;
 gss_buffer_desc acceptor_address;
 gss_buffer_desc application_data;
 } *gss_channel_bindings_t;
+typedef const struct gss_channel_bindings_struct *gss_const_channel_bindings_t;
 /*
 * For now, define a QOP-type as an OM_uint32
 */
 typedef OM_uint32       gss_qop_t;
 #define GSS_C_CONF_FLAG 16
 #define GSS_C_INTEG_FLAG 32
 #define GSS_C_ANON_FLAG 64
 #define GSS_C_PROT_READY_FLAG 128
 #define GSS_C_TRANS_FLAG 256
+#define GSS_C_DELEG_POLICY_FLAG 32768
 /*
 * Credential usage options
 */
 #define GSS_C_BOTH 0
 /* Function Prototypes */
 GSS_DLLIMP OM_uint32 gss_acquire_cred(
 OM_uint32 *,            /* minor_status */
-gss_name_t,             /* desired_name */
+gss_const_name_t,       /* desired_name */
 OM_uint32,              /* time_req */
-gss_OID_set,            /* desired_mechs */
+const gss_OID_set,      /* desired_mechs */
 gss_cred_usage_t,       /* cred_usage */
 gss_cred_id_t *,        /* output_cred_handle */
 gss_OID_set *,          /* actual_mechs */
 OM_uint32 *             /* time_rec */
 );
 gss_cred_id_t *         /* cred_handle */
 );
 GSS_DLLIMP OM_uint32 gss_init_sec_context(
 OM_uint32 *,            /* minor_status */
-gss_cred_id_t,          /* claimant_cred_handle */
+gss_const_cred_id_t,    /* claimant_cred_handle */
 gss_ctx_id_t *,         /* context_handle */
-gss_name_t,             /* target_name */
+gss_const_name_t,       /* target_name */
-gss_OID,                /* mech_type (used to be const) */
+const gss_OID,          /* mech_type */
 OM_uint32,              /* req_flags */
 OM_uint32,              /* time_req */
-gss_channel_bindings_t, /* input_chan_bindings */
+const gss_channel_bindings_t, /* input_chan_bindings */
-gss_buffer_t,           /* input_token */
+const gss_buffer_t,     /* input_token */
 gss_OID *,              /* actual_mech_type */
 gss_buffer_t,           /* output_token */
 OM_uint32 *,            /* ret_flags */
 OM_uint32 *             /* time_rec */
 );
 GSS_DLLIMP OM_uint32 gss_accept_sec_context(
 OM_uint32 *,            /* minor_status */
 gss_ctx_id_t *,         /* context_handle */
-gss_cred_id_t,          /* acceptor_cred_handle */
+gss_const_cred_id_t,    /* acceptor_cred_handle */
-gss_buffer_t,           /* input_token_buffer */
+const gss_buffer_t,     /* input_token_buffer */
-gss_channel_bindings_t, /* input_chan_bindings */
+const gss_channel_bindings_t, /* input_chan_bindings */
 gss_name_t *,           /* src_name */
 gss_OID *,              /* mech_type */
 gss_buffer_t,           /* output_token */
 OM_uint32 *,            /* ret_flags */
 OM_uint32 *,            /* time_rec */
 gss_cred_id_t *         /* delegated_cred_handle */
 );
 GSS_DLLIMP OM_uint32 gss_process_context_token(
 OM_uint32 *,            /* minor_status */
-gss_ctx_id_t,           /* context_handle */
+gss_const_ctx_id_t,     /* context_handle */
-gss_buffer_t            /* token_buffer */
+const gss_buffer_t      /* token_buffer */
 );
 GSS_DLLIMP OM_uint32 gss_delete_sec_context(
 OM_uint32 *,            /* minor_status */
 gss_ctx_id_t *,         /* context_handle */
 gss_buffer_t            /* output_token */
 );
 GSS_DLLIMP OM_uint32 gss_context_time(
 OM_uint32 *,            /* minor_status */
-gss_ctx_id_t,           /* context_handle */
+gss_const_ctx_id_t,     /* context_handle */
 OM_uint32 *             /* time_rec */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_get_mic(
 OM_uint32 *,            /* minor_status */
-gss_ctx_id_t,           /* context_handle */
+gss_const_ctx_id_t,     /* context_handle */
 gss_qop_t,              /* qop_req */
-gss_buffer_t,           /* message_buffer */
+const gss_buffer_t,     /* message_buffer */
 gss_buffer_t            /* message_token */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_verify_mic(
 OM_uint32 *,            /* minor_status */
-gss_ctx_id_t,           /* context_handle */
+gss_const_ctx_id_t,     /* context_handle */
-gss_buffer_t,           /* message_buffer */
+const gss_buffer_t,     /* message_buffer */
-gss_buffer_t,           /* message_token */
+const gss_buffer_t,     /* message_token */
 gss_qop_t *             /* qop_state */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_wrap(
 OM_uint32 *,            /* minor_status */
-gss_ctx_id_t,           /* context_handle */
+gss_const_ctx_id_t,     /* context_handle */
 int,                    /* conf_req_flag */
 gss_qop_t,              /* qop_req */
-gss_buffer_t,           /* input_message_buffer */
+const gss_buffer_t,     /* input_message_buffer */
 int *,                  /* conf_state */
 gss_buffer_t            /* output_message_buffer */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_unwrap(
 OM_uint32 *,            /* minor_status */
-gss_ctx_id_t,           /* context_handle */
+gss_const_ctx_id_t,     /* context_handle */
-gss_buffer_t,           /* input_message_buffer */
+const gss_buffer_t,     /* input_message_buffer */
 gss_buffer_t,           /* output_message_buffer */
 int *,                  /* conf_state */
 gss_qop_t *             /* qop_state */
 );
 GSS_DLLIMP OM_uint32 gss_display_status(
 OM_uint32 *,            /* minor_status */
 OM_uint32,              /* status_value */
 int,                    /* status_type */
-gss_OID,                /* mech_type (used to be const) */
+const gss_OID,          /* mech_type (used to be const) */
 OM_uint32 *,            /* message_context */
 gss_buffer_t            /* status_string */
 );
 GSS_DLLIMP OM_uint32 gss_indicate_mechs(
 gss_OID_set *           /* mech_set */
 );
 GSS_DLLIMP OM_uint32 gss_compare_name(
 OM_uint32 *,            /* minor_status */
-gss_name_t,             /* name1 */
+gss_const_name_t,       /* name1 */
-gss_name_t,             /* name2 */
+gss_const_name_t,       /* name2 */
 int *                   /* name_equal */
 );
 GSS_DLLIMP OM_uint32 gss_display_name(
 OM_uint32 *,            /* minor_status */
-gss_name_t,             /* input_name */
+gss_const_name_t,       /* input_name */
 gss_buffer_t,           /* output_name_buffer */
 gss_OID *               /* output_name_type */
 );
 GSS_DLLIMP OM_uint32 gss_import_name(
 OM_uint32 *,            /* minor_status */
-gss_buffer_t,           /* input_name_buffer */
+const gss_buffer_t,     /* input_name_buffer */
-gss_OID,                /* input_name_type(used to be const) */
+const gss_OID,          /* input_name_type(used to be const) */
 gss_name_t *            /* output_name */
 );
 GSS_DLLIMP OM_uint32 gss_release_name(
 OM_uint32 *,            /* minor_status */
 gss_OID_set *           /* set */
 );
 GSS_DLLIMP OM_uint32 gss_inquire_cred(
 OM_uint32 *,            /* minor_status */
-gss_cred_id_t,          /* cred_handle */
+gss_const_cred_id_t,    /* cred_handle */
 gss_name_t *,           /* name */
 OM_uint32 *,            /* lifetime */
 gss_cred_usage_t *,     /* cred_usage */
 gss_OID_set *           /* mechanisms */
 );
 /* Last argument new for V2 */
 GSS_DLLIMP OM_uint32 gss_inquire_context(
 OM_uint32 *,            /* minor_status */
-gss_ctx_id_t,           /* context_handle */
+gss_const_ctx_id_t,     /* context_handle */
 gss_name_t *,           /* src_name */
 gss_name_t *,           /* targ_name */
 OM_uint32 *,            /* lifetime_rec */
 gss_OID *,              /* mech_type */
 OM_uint32 *,            /* ctx_flags */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_wrap_size_limit(
 OM_uint32 *,            /* minor_status */
-gss_ctx_id_t,           /* context_handle */
+gss_const_ctx_id_t,     /* context_handle */
 int,                    /* conf_req_flag */
 gss_qop_t,              /* qop_req */
 OM_uint32,              /* req_output_size */
 OM_uint32 *             /* max_input_size */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_add_cred(
 OM_uint32 *,            /* minor_status */
-gss_cred_id_t,          /* input_cred_handle */
+gss_const_cred_id_t,    /* input_cred_handle */
-gss_name_t,             /* desired_name */
+gss_const_name_t,       /* desired_name */
-gss_OID,                /* desired_mech */
+const gss_OID,          /* desired_mech */
 gss_cred_usage_t,       /* cred_usage */
 OM_uint32,              /* initiator_time_req */
 OM_uint32,              /* acceptor_time_req */
 gss_cred_id_t *,        /* output_cred_handle */
 gss_OID_set *,          /* actual_mechs */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_inquire_cred_by_mech(
 OM_uint32 *,            /* minor_status */
-gss_cred_id_t,          /* cred_handle */
+gss_const_cred_id_t,    /* cred_handle */
-gss_OID,                /* mech_type */
+const gss_OID,          /* mech_type */
 gss_name_t *,           /* name */
 OM_uint32 *,            /* initiator_lifetime */
 OM_uint32 *,            /* acceptor_lifetime */
 gss_cred_usage_t *      /* cred_usage */
 );
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_import_sec_context(
 OM_uint32 *,            /* minor_status */
-gss_buffer_t,           /* interprocess_token */
+const gss_buffer_t,     /* interprocess_token */
 gss_ctx_id_t *          /* context_handle */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_release_oid(
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_add_oid_set_member(
 OM_uint32 *,            /* minor_status */
-gss_OID,                /* member_oid */
+const gss_OID,          /* member_oid */
 gss_OID_set *           /* oid_set */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_test_oid_set_member(
 OM_uint32 *,            /* minor_status */
-gss_OID,                /* member */
+const gss_OID,          /* member */
-gss_OID_set,            /* set */
+const gss_OID_set,      /* set */
 int *                   /* present */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_str_to_oid(
 OM_uint32 *,            /* minor_status */
-gss_buffer_t,           /* oid_str */
+const gss_buffer_t,     /* oid_str */
 gss_OID *               /* oid */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_oid_to_str(
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_inquire_names_for_mech(
 OM_uint32 *,            /* minor_status */
-gss_OID,                /* mechanism */
+const gss_OID,          /* mechanism */
 gss_OID_set *           /* name_types */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_export_name(
 OM_uint32  *,           /* minor_status */
-const gss_name_t,       /* input_name */
+gss_const_name_t,       /* input_name */
 gss_buffer_t            /* exported_name */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_duplicate_name(
 OM_uint32  *,           /* minor_status */
-const gss_name_t,       /* input_name */
+gss_const_name_t,       /* input_name */
 gss_name_t *            /* dest_name */
 );
 /* New for V2 */
 GSS_DLLIMP OM_uint32 gss_canonicalize_name(
 OM_uint32  *,           /* minor_status */
-const gss_name_t,       /* input_name */
+gss_const_name_t,       /* input_name */
 const gss_OID,          /* mech_type */
 gss_name_t *            /* output_name */
 );
 #if TARGET_OS_MAC

changeset 55354	74f0622db875
parent 49682	2918e1146106
child 55638	430a51e86f28