diff options
Diffstat (limited to 'src/lib/gssapi')
45 files changed, 249 insertions, 237 deletions
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 5e3c5a3f38..e28a507675 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 13 16:27:56 1995 Keith Vetter (keithv@fusion.com) + + * gssapi_e.c: __STDC__ conditional also checks the _WINDOWS define. + * *.[ch]: removed unneeded INTERFACE from non-api functions. + * *.h added FAR to pointers visible at to the world. + Tue Mar 28 18:28:03 1995 John Gilmore (gnu at toad.com) * Makefile.in (unixmac): Add to build header files. diff --git a/src/lib/gssapi/generic/disp_com_err_status.c b/src/lib/gssapi/generic/disp_com_err_status.c index 369c962f5b..79b5fbbe2e 100644 --- a/src/lib/gssapi/generic/disp_com_err_status.c +++ b/src/lib/gssapi/generic/disp_com_err_status.c @@ -40,7 +40,7 @@ static const char * const no_error = "No error"; if status_type == GSS_C_MECH_CODE, return the output from error_message() */ -OM_uint32 INTERFACE +OM_uint32 g_display_com_err_status(minor_status, status_value, status_string) OM_uint32 *minor_status; OM_uint32 status_value; diff --git a/src/lib/gssapi/generic/disp_major_status.c b/src/lib/gssapi/generic/disp_major_status.c index 7dadd3e10f..c6f82789dc 100644 --- a/src/lib/gssapi/generic/disp_major_status.c +++ b/src/lib/gssapi/generic/disp_major_status.c @@ -202,7 +202,7 @@ static OM_uint32 display_bit(minor_status, code, status_string) message_context > 2 : print supplementary info bit (message_context-2) */ -OM_uint32 INTERFACE g_display_major_status(minor_status, status_value, +OM_uint32 g_display_major_status(minor_status, status_value, message_context, status_string) OM_uint32 *minor_status; OM_uint32 status_value; diff --git a/src/lib/gssapi/generic/gssapi.h b/src/lib/gssapi/generic/gssapi.h index b8bf1fa1a1..61d01de0d7 100644 --- a/src/lib/gssapi/generic/gssapi.h +++ b/src/lib/gssapi/generic/gssapi.h @@ -37,9 +37,9 @@ * First, define the platform-dependent types. */ typedef krb5_ui_4 OM_uint32; -typedef void * gss_name_t; -typedef void * gss_cred_id_t; -typedef void * gss_ctx_id_t; +typedef void FAR * gss_name_t; +typedef void FAR * gss_cred_id_t; +typedef void FAR * gss_ctx_id_t; /* * Note that a platform supporting the xom.h X/Open header file @@ -49,20 +49,20 @@ typedef void * gss_ctx_id_t; typedef struct gss_OID_desc_struct { OM_uint32 length; - void *elements; -} gss_OID_desc, *gss_OID; + void FAR *elements; +} gss_OID_desc, FAR *gss_OID; -typedef const gss_OID_desc * const const_gss_OID; +typedef const gss_OID_desc FAR * const const_gss_OID; typedef struct gss_OID_set_desc_struct { int count; gss_OID elements; -} gss_OID_set_desc, *gss_OID_set; +} gss_OID_set_desc, FAR *gss_OID_set; typedef struct gss_buffer_desc_struct { size_t length; - void *value; -} gss_buffer_desc, *gss_buffer_t; + void FAR *value; +} gss_buffer_desc, FAR *gss_buffer_t; typedef struct gss_channel_bindings_struct { OM_uint32 initiator_addrtype; @@ -70,7 +70,7 @@ typedef struct gss_channel_bindings_struct { OM_uint32 acceptor_addrtype; gss_buffer_desc acceptor_address; gss_buffer_desc application_data; -} *gss_channel_bindings_t; +} FAR *gss_channel_bindings_t; /* @@ -233,174 +233,174 @@ typedef struct gss_channel_bindings_struct { */ OM_uint32 INTERFACE gss_acquire_cred -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_name_t, /* desired_name */ - OM_uint32, /* time_req */ - gss_OID_set, /* desired_mechs */ - int, /* cred_usage */ - gss_cred_id_t*, /* output_cred_handle */ - gss_OID_set*, /* actual_mechs */ - OM_uint32* /* time_rec */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_name_t, /* desired_name */ + OM_uint32, /* time_req */ + gss_OID_set, /* desired_mechs */ + int, /* cred_usage */ + gss_cred_id_t FAR *,/* output_cred_handle */ + gss_OID_set FAR *, /* actual_mechs */ + OM_uint32 FAR * /* time_rec */ )); OM_uint32 INTERFACE gss_release_cred -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_cred_id_t* /* cred_handle */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_cred_id_t FAR * /* cred_handle */ )); OM_uint32 INTERFACE gss_init_sec_context -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_cred_id_t, /* claimant_cred_handle */ - gss_ctx_id_t*, /* context_handle */ - gss_name_t, /* target_name */ - const_gss_OID, /* mech_type */ - int, /* req_flags */ - OM_uint32, /* time_req */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_cred_id_t, /* claimant_cred_handle */ + gss_ctx_id_t FAR *, /* context_handle */ + gss_name_t, /* target_name */ + const_gss_OID, /* mech_type */ + int, /* req_flags */ + OM_uint32, /* time_req */ gss_channel_bindings_t, - /* input_chan_bindings */ - gss_buffer_t, /* input_token */ - gss_OID*, /* actual_mech_type */ - gss_buffer_t, /* output_token */ - int*, /* ret_flags */ - OM_uint32* /* time_rec */ + /* input_chan_bindings */ + gss_buffer_t, /* input_token */ + gss_OID FAR *, /* actual_mech_type */ + gss_buffer_t, /* output_token */ + int FAR *, /* ret_flags */ + OM_uint32 FAR * /* time_rec */ )); OM_uint32 INTERFACE gss_accept_sec_context -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t*, /* context_handle */ - gss_cred_id_t, /* verifier_cred_handle */ - gss_buffer_t, /* input_token_buffer */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t FAR *, /* context_handle */ + gss_cred_id_t, /* verifier_cred_handle */ + gss_buffer_t, /* input_token_buffer */ gss_channel_bindings_t, - /* input_chan_bindings */ - gss_name_t*, /* src_name */ - gss_OID*, /* mech_type */ - gss_buffer_t, /* output_token */ - int*, /* ret_flags */ - OM_uint32*, /* time_rec */ - gss_cred_id_t* /* delegated_cred_handle */ + /* input_chan_bindings */ + gss_name_t FAR *, /* src_name */ + gss_OID FAR *, /* mech_type */ + gss_buffer_t, /* output_token */ + int FAR *, /* ret_flags */ + OM_uint32 FAR *, /* time_rec */ + gss_cred_id_t FAR * /* delegated_cred_handle */ )); OM_uint32 INTERFACE gss_process_context_token -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - gss_buffer_t /* token_buffer */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + gss_buffer_t /* token_buffer */ )); OM_uint32 INTERFACE gss_delete_sec_context -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t*, /* context_handle */ - gss_buffer_t /* output_token */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t FAR *, /* context_handle */ + gss_buffer_t /* output_token */ )); OM_uint32 INTERFACE gss_context_time -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - OM_uint32* /* time_rec */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + OM_uint32 FAR * /* time_rec */ )); OM_uint32 INTERFACE gss_sign -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - int, /* qop_req */ - gss_buffer_t, /* message_buffer */ - gss_buffer_t /* message_token */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + int, /* qop_req */ + gss_buffer_t, /* message_buffer */ + gss_buffer_t /* message_token */ )); -OM_uint32 INTERFACE INTERFACE gss_verify -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - gss_buffer_t, /* message_buffer */ - gss_buffer_t, /* token_buffer */ - int* /* qop_state */ +OM_uint32 INTERFACE gss_verify +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + gss_buffer_t, /* message_buffer */ + gss_buffer_t, /* token_buffer */ + int FAR * /* qop_state */ )); OM_uint32 INTERFACE gss_seal -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - int, /* conf_req_flag */ - int, /* qop_req */ - gss_buffer_t, /* input_message_buffer */ - int*, /* conf_state */ - gss_buffer_t /* output_message_buffer */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + int, /* conf_req_flag */ + int, /* qop_req */ + gss_buffer_t, /* input_message_buffer */ + int FAR *, /* conf_state */ + gss_buffer_t /* output_message_buffer */ )); OM_uint32 INTERFACE gss_unseal -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - gss_buffer_t, /* input_message_buffer */ - gss_buffer_t, /* output_message_buffer */ - int*, /* conf_state */ - int* /* qop_state */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + gss_buffer_t, /* input_message_buffer */ + gss_buffer_t, /* output_message_buffer */ + int FAR *, /* conf_state */ + int FAR * /* qop_state */ )); OM_uint32 INTERFACE gss_display_status -PROTOTYPE( (OM_uint32*, /* minor_status */ - OM_uint32, /* status_value */ - int, /* status_type */ - const_gss_OID, /* mech_type */ - int*, /* message_context */ - gss_buffer_t /* status_string */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + OM_uint32, /* status_value */ + int, /* status_type */ + const_gss_OID, /* mech_type */ + int FAR *, /* message_context */ + gss_buffer_t /* status_string */ )); OM_uint32 INTERFACE gss_indicate_mechs -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_OID_set* /* mech_set */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_OID_set FAR * /* mech_set */ )); OM_uint32 INTERFACE gss_compare_name -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_name_t, /* name1 */ - gss_name_t, /* name2 */ - int* /* name_equal */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_name_t, /* name1 */ + gss_name_t, /* name2 */ + int FAR * /* name_equal */ )); OM_uint32 INTERFACE gss_display_name -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_name_t, /* input_name */ - gss_buffer_t, /* output_name_buffer */ - gss_OID* /* output_name_type */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_name_t, /* input_name */ + gss_buffer_t, /* output_name_buffer */ + gss_OID FAR * /* output_name_type */ )); OM_uint32 INTERFACE gss_import_name -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_buffer_t, /* input_name_buffer */ - const_gss_OID, /* input_name_type */ - gss_name_t* /* output_name */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_buffer_t, /* input_name_buffer */ + const_gss_OID, /* input_name_type */ + gss_name_t FAR * /* output_name */ )); OM_uint32 INTERFACE gss_release_name -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_name_t* /* input_name */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_name_t FAR * /* input_name */ )); OM_uint32 INTERFACE gss_release_buffer -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_buffer_t /* buffer */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_buffer_t /* buffer */ )); OM_uint32 INTERFACE gss_release_oid_set -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_OID_set* /* set */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_OID_set FAR * /* set */ )); OM_uint32 INTERFACE gss_inquire_cred -PROTOTYPE( (OM_uint32 *, /* minor_status */ - gss_cred_id_t, /* cred_handle */ - gss_name_t *, /* name */ - OM_uint32 *, /* lifetime */ - int *, /* cred_usage */ - gss_OID_set * /* mechanisms */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_cred_id_t, /* cred_handle */ + gss_name_t FAR *, /* name */ + OM_uint32 FAR *, /* lifetime */ + int FAR *, /* cred_usage */ + gss_OID_set FAR * /* mechanisms */ )); OM_uint32 INTERFACE gss_inquire_context -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - gss_name_t*, /* initiator_name */ - gss_name_t*, /* acceptor_name */ - OM_uint32*, /* lifetime_rec */ - gss_OID*, /* mech_type */ - int*, /* ret_flags */ - int* /* locally_initiated */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + gss_name_t FAR *, /* initiator_name */ + gss_name_t FAR *, /* acceptor_name */ + OM_uint32 FAR *, /* lifetime_rec */ + gss_OID FAR *, /* mech_type */ + int FAR *, /* ret_flags */ + int FAR * /* locally_initiated */ )); diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h index d8d86bb6a7..49a876bf9f 100644 --- a/src/lib/gssapi/generic/gssapiP_generic.h +++ b/src/lib/gssapi/generic/gssapiP_generic.h @@ -76,51 +76,51 @@ /** helper functions **/ -int INTERFACE g_save_name PROTOTYPE((void **vdb, gss_name_t *name)); -int INTERFACE g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); -int INTERFACE g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); +int g_save_name PROTOTYPE((void **vdb, gss_name_t *name)); +int g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); +int g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); -int INTERFACE g_validate_name PROTOTYPE((void **vdb, gss_name_t *name)); -int INTERFACE g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); -int INTERFACE g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); +int g_validate_name PROTOTYPE((void **vdb, gss_name_t *name)); +int g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); +int g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); -int INTERFACE g_delete_name PROTOTYPE((void **vdb, gss_name_t *name)); -int INTERFACE g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); -int INTERFACE g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); +int g_delete_name PROTOTYPE((void **vdb, gss_name_t *name)); +int g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); +int g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); -int INTERFACE g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer)); +int g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer)); -int INTERFACE g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out)); +int g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out)); -int INTERFACE g_token_size PROTOTYPE((const_gss_OID mech, unsigned int body_size)); +int g_token_size PROTOTYPE((const_gss_OID mech, unsigned int body_size)); -void INTERFACE g_make_token_header PROTOTYPE((const_gss_OID mech, int body_size, +void g_make_token_header PROTOTYPE((const_gss_OID mech, int body_size, unsigned char **buf, int tok_type)); -int INTERFACE g_verify_token_header PROTOTYPE((const_gss_OID mech, int *body_size, +int g_verify_token_header PROTOTYPE((const_gss_OID mech, int *body_size, unsigned char **buf, int tok_type, int toksize)); -OM_uint32 INTERFACE g_display_major_status PROTOTYPE((OM_uint32 *minor_status, +OM_uint32 g_display_major_status PROTOTYPE((OM_uint32 *minor_status, OM_uint32 status_value, int *message_context, gss_buffer_t status_string)); -OM_uint32 INTERFACE INTERFACE g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status, +OM_uint32 g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status, OM_uint32 status_value, gss_buffer_t status_string)); -char * INTERFACE g_canonicalize_host PROTOTYPE((char *hostname)); +char * g_canonicalize_host PROTOTYPE((char *hostname)); -char * INTERFACE g_strdup PROTOTYPE((char *str)); +char * g_strdup PROTOTYPE((char *str)); /** declarations of internal name mechanism functions **/ -OM_uint32 INTERFACE generic_gss_release_buffer +OM_uint32 generic_gss_release_buffer PROTOTYPE( (OM_uint32*, /* minor_status */ gss_buffer_t /* buffer */ )); -OM_uint32 INTERFACE generic_gss_release_oid_set +OM_uint32 generic_gss_release_oid_set PROTOTYPE( (OM_uint32*, /* minor_status */ gss_OID_set* /* set */ )); diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h index f8f89e3c46..9073840dea 100644 --- a/src/lib/gssapi/generic/gssapi_generic.h +++ b/src/lib/gssapi/generic/gssapi_generic.h @@ -25,9 +25,9 @@ #include <gssapi/gssapi.h> -extern const gss_OID_desc * const gss_nt_user_name; -extern const gss_OID_desc * const gss_nt_machine_uid_name; -extern const gss_OID_desc * const gss_nt_string_uid_name; -extern const gss_OID_desc * const gss_nt_service_name; +extern const gss_OID_desc FAR * const gss_nt_user_name; +extern const gss_OID_desc FAR * const gss_nt_machine_uid_name; +extern const gss_OID_desc FAR * const gss_nt_string_uid_name; +extern const gss_OID_desc FAR * const gss_nt_service_name; #endif /* _GSSAPI_GENERIC_H_ */ diff --git a/src/lib/gssapi/generic/rel_buffer.c b/src/lib/gssapi/generic/rel_buffer.c index 2345fc4b0d..b764a5b5f2 100644 --- a/src/lib/gssapi/generic/rel_buffer.c +++ b/src/lib/gssapi/generic/rel_buffer.c @@ -22,7 +22,7 @@ #include "gssapiP_generic.h" -OM_uint32 INTERFACE generic_gss_release_buffer(minor_status, buffer) +OM_uint32 generic_gss_release_buffer(minor_status, buffer) OM_uint32 *minor_status; gss_buffer_t buffer; { diff --git a/src/lib/gssapi/generic/rel_oid_set.c b/src/lib/gssapi/generic/rel_oid_set.c index 073664a192..2edfe9a39a 100644 --- a/src/lib/gssapi/generic/rel_oid_set.c +++ b/src/lib/gssapi/generic/rel_oid_set.c @@ -22,7 +22,7 @@ #include "gssapiP_generic.h" -OM_uint32 INTERFACE generic_gss_release_oid_set(minor_status, set) +OM_uint32 generic_gss_release_oid_set(minor_status, set) OM_uint32 *minor_status; gss_OID_set *set; { diff --git a/src/lib/gssapi/generic/util_buffer.c b/src/lib/gssapi/generic/util_buffer.c index 5fd06721c2..cf144495f8 100644 --- a/src/lib/gssapi/generic/util_buffer.c +++ b/src/lib/gssapi/generic/util_buffer.c @@ -27,7 +27,7 @@ make sure that buffer is consistent (release'able) when this function exits, no matter what the exit value */ -int INTERFACE g_make_string_buffer(str, buffer) +int g_make_string_buffer(str, buffer) const char *str; gss_buffer_t buffer; { diff --git a/src/lib/gssapi/generic/util_canonhost.c b/src/lib/gssapi/generic/util_canonhost.c index 409435f029..712d0ee077 100644 --- a/src/lib/gssapi/generic/util_canonhost.c +++ b/src/lib/gssapi/generic/util_canonhost.c @@ -28,7 +28,7 @@ #include <ctype.h> #include <string.h> -char * INTERFACE +char * g_canonicalize_host(hostname) char *hostname; { diff --git a/src/lib/gssapi/generic/util_dup.c b/src/lib/gssapi/generic/util_dup.c index d6ce11824a..6b19092db8 100644 --- a/src/lib/gssapi/generic/util_dup.c +++ b/src/lib/gssapi/generic/util_dup.c @@ -23,7 +23,7 @@ #include "gssapiP_generic.h" #include <string.h> -char * INTERFACE g_strdup(str) +char * g_strdup(str) char *str; { char *ret; diff --git a/src/lib/gssapi/generic/util_oid.c b/src/lib/gssapi/generic/util_oid.c index 8f3d434eb6..c415aad76f 100644 --- a/src/lib/gssapi/generic/util_oid.c +++ b/src/lib/gssapi/generic/util_oid.c @@ -22,7 +22,7 @@ #include "gssapiP_generic.h" -int INTERFACE +int g_copy_OID_set(in, out) const gss_OID_set_desc * const in; gss_OID_set *out; diff --git a/src/lib/gssapi/generic/util_token.c b/src/lib/gssapi/generic/util_token.c index c5067fde95..c378198943 100644 --- a/src/lib/gssapi/generic/util_token.c +++ b/src/lib/gssapi/generic/util_token.c @@ -111,7 +111,7 @@ static int der_read_length(buf, bufsize) /* returns the length of a token, given the mech oid and the body size */ -int INTERFACE g_token_size(mech, body_size) +int g_token_size(mech, body_size) const_gss_OID mech; unsigned int body_size; { @@ -123,7 +123,7 @@ int INTERFACE g_token_size(mech, body_size) /* fills in a buffer with the token header. The buffer is assumed to be the right size. buf is advanced past the token header */ -void INTERFACE g_make_token_header(mech, body_size, buf, tok_type) +void g_make_token_header(mech, body_size, buf, tok_type) const_gss_OID mech; int body_size; unsigned char **buf; @@ -142,7 +142,7 @@ void INTERFACE g_make_token_header(mech, body_size, buf, tok_type) leaving buf advanced past the token header, and setting body_size to the number of remaining bytes */ -int INTERFACE g_verify_token_header(mech, body_size, buf, tok_type, toksize) +int g_verify_token_header(mech, body_size, buf, tok_type, toksize) const_gss_OID mech; int *body_size; unsigned char **buf; diff --git a/src/lib/gssapi/generic/util_validate.c b/src/lib/gssapi/generic/util_validate.c index e60ed427b0..72631341ba 100644 --- a/src/lib/gssapi/generic/util_validate.c +++ b/src/lib/gssapi/generic/util_validate.c @@ -105,45 +105,45 @@ static int g_delete(DB **vdb, int type, void *ptr) /* save */ -int INTERFACE g_save_name(void **vdb, gss_name_t *name) +int g_save_name(void **vdb, gss_name_t *name) { return(g_save((DB **) vdb, V_NAME, (void *) name)); } -int INTERFACE g_save_cred_id(void **vdb, gss_cred_id_t *cred) +int g_save_cred_id(void **vdb, gss_cred_id_t *cred) { return(g_save((DB **) vdb, V_CRED_ID, (void *) cred)); } -int INTERFACE g_save_ctx_id(void **vdb, gss_ctx_id_t *ctx) +int g_save_ctx_id(void **vdb, gss_ctx_id_t *ctx) { return(g_save((DB **) vdb, V_CTX_ID, (void *) ctx)); } /* validate */ -int INTERFACE g_validate_name(void **vdb, gss_name_t *name) +int g_validate_name(void **vdb, gss_name_t *name) { return(g_validate((DB **) vdb, V_NAME, (void *) name)); } -int INTERFACE g_validate_cred_id(void **vdb, gss_cred_id_t *cred) +int g_validate_cred_id(void **vdb, gss_cred_id_t *cred) { return(g_validate((DB **) vdb, V_CRED_ID, (void *) cred)); } -int INTERFACE g_validate_ctx_id(void **vdb, gss_ctx_id_t *ctx) +int g_validate_ctx_id(void **vdb, gss_ctx_id_t *ctx) { return(g_validate((DB **) vdb, V_CTX_ID, (void *) ctx)); } /* delete */ -int INTERFACE g_delete_name(void **vdb, gss_name_t *name) +int g_delete_name(void **vdb, gss_name_t *name) { return(g_delete((DB **) vdb, V_NAME, (void *) name)); } -int INTERFACE g_delete_cred_id(void **vdb, gss_cred_id_t *cred) +int g_delete_cred_id(void **vdb, gss_cred_id_t *cred) { return(g_delete((DB **) vdb, V_CRED_ID, (void *) cred)); } -int INTERFACE g_delete_ctx_id(void **vdb, gss_ctx_id_t *ctx) +int g_delete_ctx_id(void **vdb, gss_ctx_id_t *ctx) { return(g_delete((DB **) vdb, V_CTX_ID, (void *) ctx)); } diff --git a/src/lib/gssapi/generic/utl_nohash_validate.c b/src/lib/gssapi/generic/utl_nohash_validate.c index 88ad5937cd..eaa83d34dd 100644 --- a/src/lib/gssapi/generic/utl_nohash_validate.c +++ b/src/lib/gssapi/generic/utl_nohash_validate.c @@ -33,19 +33,19 @@ /* save */ -int INTERFACE g_save_name(vdb, name) +int g_save_name(vdb, name) void **vdb; gss_name_t *name; { return 1; } -int INTERFACE g_save_cred_id(vdb, cred) +int g_save_cred_id(vdb, cred) void **vdb; gss_cred_id_t *cred; { return 1; } -int INTERFACE g_save_ctx_id(vdb, ctx) +int g_save_ctx_id(vdb, ctx) void **vdb; gss_ctx_id_t *ctx; { @@ -54,19 +54,19 @@ int INTERFACE g_save_ctx_id(vdb, ctx) /* validate */ -int INTERFACE g_validate_name(vdb, name) +int g_validate_name(vdb, name) void **vdb; gss_name_t *name; { return 1; } -int INTERFACE g_validate_cred_id(vdb, cred) +int g_validate_cred_id(vdb, cred) void **vdb; gss_cred_id_t *cred; { return 1; } -int INTERFACE g_validate_ctx_id(vdb, ctx) +int g_validate_ctx_id(vdb, ctx) void **vdb; gss_ctx_id_t *ctx; { @@ -75,19 +75,19 @@ int INTERFACE g_validate_ctx_id(vdb, ctx) /* delete */ -int INTERFACE g_delete_name(vdb, name) +int g_delete_name(vdb, name) void **vdb; gss_name_t *name; { return 1; } -int INTERFACE g_delete_cred_id(vdb, cred) +int g_delete_cred_id(vdb, cred) void **vdb; gss_cred_id_t *cred; { return 1; } -int INTERFACE g_delete_ctx_id(vdb, ctx) +int g_delete_ctx_id(vdb, ctx) void **vdb; gss_ctx_id_t *ctx; { diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index d34555da72..870f13f75f 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + * *.h added FAR to pointers visible at to the world. + * gssapi_e.c: __STDC__ conditional also checks the _WINDOWS define. + Thu Mar 30 16:00:30 1995 Keith Vetter (keithv@fusion.com) * accept_sec_context.c: fixed wrong level of indirection on a diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index 3f35197e57..78f1839080 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -24,7 +24,7 @@ #include <krb5/rsa-md5.h> #include <memory.h> -OM_uint32 INTERFACE +OM_uint32 krb5_gss_accept_sec_context(context, minor_status, context_handle, verifier_cred_handle, input_token, input_chan_bindings, src_name, mech_type, diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c index 419643b90c..10563d6944 100644 --- a/src/lib/gssapi/krb5/acquire_cred.c +++ b/src/lib/gssapi/krb5/acquire_cred.c @@ -237,7 +237,7 @@ acquire_init_cred(context, minor_status, desired_name, output_princ, cred) } /*ARGSUSED*/ -OM_uint32 INTERFACE +OM_uint32 krb5_gss_acquire_cred(context, minor_status, desired_name, time_req, desired_mechs, cred_usage, output_cred_handle, actual_mechs, time_rec) diff --git a/src/lib/gssapi/krb5/compare_name.c b/src/lib/gssapi/krb5/compare_name.c index e73797a62e..c18eace1ba 100644 --- a/src/lib/gssapi/krb5/compare_name.c +++ b/src/lib/gssapi/krb5/compare_name.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_compare_name(context, minor_status, name1, name2, name_equal) krb5_context context; OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/context_time.c b/src/lib/gssapi/krb5/context_time.c index 05276c305f..8b849ea5a8 100644 --- a/src/lib/gssapi/krb5/context_time.c +++ b/src/lib/gssapi/krb5/context_time.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_context_time(context, minor_status, context_handle, time_rec) krb5_context context; OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/delete_sec_context.c b/src/lib/gssapi/krb5/delete_sec_context.c index e7ccdfa332..8127ea61e2 100644 --- a/src/lib/gssapi/krb5/delete_sec_context.c +++ b/src/lib/gssapi/krb5/delete_sec_context.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_delete_sec_context(context, minor_status, context_handle, output_token) krb5_context context; OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/disp_name.c b/src/lib/gssapi/krb5/disp_name.c index f59d7aef8a..3ce5ac25b3 100644 --- a/src/lib/gssapi/krb5/disp_name.c +++ b/src/lib/gssapi/krb5/disp_name.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_display_name(context, minor_status, input_name, output_name_buffer, output_name_type) krb5_context context; diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c index e1df99803f..4e04d9b6b8 100644 --- a/src/lib/gssapi/krb5/disp_status.c +++ b/src/lib/gssapi/krb5/disp_status.c @@ -31,7 +31,7 @@ static int init_et = 0; /**/ -OM_uint32 INTERFACE +OM_uint32 krb5_gss_display_status(context, minor_status, status_value, status_type, mech_type, message_context, status_string) krb5_context context; diff --git a/src/lib/gssapi/krb5/get_tkt_flags.c b/src/lib/gssapi/krb5/get_tkt_flags.c index 1708e564e0..2e73cacfee 100644 --- a/src/lib/gssapi/krb5/get_tkt_flags.c +++ b/src/lib/gssapi/krb5/get_tkt_flags.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 gss_krb5_get_tkt_flags(minor_status, context_handle, ticket_flags) OM_uint32 *minor_status; gss_ctx_id_t context_handle; diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h index ee7ec9ab53..8d846f73ba 100644 --- a/src/lib/gssapi/krb5/gssapiP_krb5.h +++ b/src/lib/gssapi/krb5/gssapiP_krb5.h @@ -115,38 +115,38 @@ extern krb5_context kg_context; /** helper functions **/ -OM_uint32 INTERFACE kg_get_defcred +OM_uint32 kg_get_defcred PROTOTYPE((OM_uint32 *minor_status, gss_cred_id_t *cred)); -OM_uint32 INTERFACE kg_release_defcred PROTOTYPE((OM_uint32 *minor_status)); +OM_uint32 kg_release_defcred PROTOTYPE((OM_uint32 *minor_status)); -krb5_error_code INTERFACE kg_checksum_channel_bindings +krb5_error_code kg_checksum_channel_bindings PROTOTYPE((gss_channel_bindings_t cb, krb5_checksum *cksum, int bigend)); -krb5_error_code INTERFACE kg_make_seq_num PROTOTYPE((krb5_gss_enc_desc *ed, +krb5_error_code kg_make_seq_num PROTOTYPE((krb5_gss_enc_desc *ed, int direction, krb5_int32 seqnum, unsigned char *cksum, unsigned char *buf)); -krb5_error_code INTERFACE kg_make_seed PROTOTYPE((krb5_keyblock *key, +krb5_error_code kg_make_seed PROTOTYPE((krb5_keyblock *key, unsigned char *seed)); -int INTERFACE kg_confounder_size PROTOTYPE((krb5_gss_enc_desc *ed)); +int kg_confounder_size PROTOTYPE((krb5_gss_enc_desc *ed)); -krb5_error_code INTERFACE kg_make_confounder PROTOTYPE((krb5_gss_enc_desc *ed, +krb5_error_code kg_make_confounder PROTOTYPE((krb5_gss_enc_desc *ed, unsigned char *buf)); -int INTERFACE kg_encrypt_size PROTOTYPE((krb5_gss_enc_desc *ed, int n)); +int kg_encrypt_size PROTOTYPE((krb5_gss_enc_desc *ed, int n)); -krb5_error_code INTERFACE kg_encrypt PROTOTYPE((krb5_gss_enc_desc *ed, +krb5_error_code kg_encrypt PROTOTYPE((krb5_gss_enc_desc *ed, krb5_pointer iv, krb5_pointer in, krb5_pointer out, int length)); -krb5_error_code INTERFACE kg_decrypt PROTOTYPE((krb5_gss_enc_desc *ed, +krb5_error_code kg_decrypt PROTOTYPE((krb5_gss_enc_desc *ed, krb5_pointer iv, krb5_pointer in, krb5_pointer out, int length)); -OM_uint32 INTERFACE kg_seal PROTOTYPE((OM_uint32 *minor_status, +OM_uint32 kg_seal PROTOTYPE((OM_uint32 *minor_status, gss_ctx_id_t context_handle, int conf_req_flag, int qop_req, @@ -155,7 +155,7 @@ OM_uint32 INTERFACE kg_seal PROTOTYPE((OM_uint32 *minor_status, gss_buffer_t output_message_buffer, int toktype)); -OM_uint32 INTERFACE kg_unseal PROTOTYPE((OM_uint32 *minor_status, +OM_uint32 kg_unseal PROTOTYPE((OM_uint32 *minor_status, gss_ctx_id_t context_handle, gss_buffer_t input_token_buffer, gss_buffer_t message_buffer, @@ -165,7 +165,7 @@ OM_uint32 INTERFACE kg_unseal PROTOTYPE((OM_uint32 *minor_status, /** declarations of internal name mechanism functions **/ -OM_uint32 INTERFACE krb5_gss_acquire_cred +OM_uint32 krb5_gss_acquire_cred PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_name_t, /* desired_name */ @@ -177,13 +177,13 @@ PROTOTYPE( (krb5_context, OM_uint32* /* time_rec */ )); -OM_uint32 INTERFACE krb5_gss_release_cred +OM_uint32 krb5_gss_release_cred PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_cred_id_t* /* cred_handle */ )); -OM_uint32 INTERFACE krb5_gss_init_sec_context +OM_uint32 krb5_gss_init_sec_context PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_cred_id_t, /* claimant_cred_handle */ @@ -201,7 +201,7 @@ PROTOTYPE( (krb5_context, OM_uint32* /* time_rec */ )); -OM_uint32 INTERFACE krb5_gss_accept_sec_context +OM_uint32 krb5_gss_accept_sec_context PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t*, /* context_handle */ @@ -217,28 +217,28 @@ PROTOTYPE( (krb5_context, gss_cred_id_t* /* delegated_cred_handle */ )); -OM_uint32 INTERFACE krb5_gss_process_context_token +OM_uint32 krb5_gss_process_context_token PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_buffer_t /* token_buffer */ )); -OM_uint32 INTERFACE krb5_gss_delete_sec_context +OM_uint32 krb5_gss_delete_sec_context PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t*, /* context_handle */ gss_buffer_t /* output_token */ )); -OM_uint32 INTERFACE krb5_gss_context_time +OM_uint32 krb5_gss_context_time PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ OM_uint32* /* time_rec */ )); -OM_uint32 INTERFACE krb5_gss_sign +OM_uint32 krb5_gss_sign PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -247,7 +247,7 @@ PROTOTYPE( (krb5_context, gss_buffer_t /* message_token */ )); -OM_uint32 INTERFACE krb5_gss_verify +OM_uint32 krb5_gss_verify PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -256,7 +256,7 @@ PROTOTYPE( (krb5_context, int* /* qop_state */ )); -OM_uint32 INTERFACE krb5_gss_seal +OM_uint32 krb5_gss_seal PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -267,7 +267,7 @@ PROTOTYPE( (krb5_context, gss_buffer_t /* output_message_buffer */ )); -OM_uint32 INTERFACE krb5_gss_unseal +OM_uint32 krb5_gss_unseal PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -277,7 +277,7 @@ PROTOTYPE( (krb5_context, int* /* qop_state */ )); -OM_uint32 INTERFACE krb5_gss_display_status +OM_uint32 krb5_gss_display_status PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ OM_uint32, /* status_value */ @@ -287,13 +287,13 @@ PROTOTYPE( (krb5_context, gss_buffer_t /* status_string */ )); -OM_uint32 INTERFACE krb5_gss_indicate_mechs +OM_uint32 krb5_gss_indicate_mechs PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_OID_set* /* mech_set */ )); -OM_uint32 INTERFACE krb5_gss_compare_name +OM_uint32 krb5_gss_compare_name PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_name_t, /* name1 */ @@ -301,7 +301,7 @@ PROTOTYPE( (krb5_context, int* /* name_equal */ )); -OM_uint32 INTERFACE krb5_gss_display_name +OM_uint32 krb5_gss_display_name PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_name_t, /* input_name */ @@ -309,7 +309,7 @@ PROTOTYPE( (krb5_context, gss_OID* /* output_name_type */ )); -OM_uint32 INTERFACE krb5_gss_import_name +OM_uint32 krb5_gss_import_name PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_buffer_t, /* input_name_buffer */ @@ -317,13 +317,13 @@ PROTOTYPE( (krb5_context, gss_name_t* /* output_name */ )); -OM_uint32 INTERFACE krb5_gss_release_name +OM_uint32 krb5_gss_release_name PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_name_t* /* input_name */ )); -OM_uint32 INTERFACE krb5_gss_inquire_cred +OM_uint32 krb5_gss_inquire_cred PROTOTYPE( (krb5_context, OM_uint32 *, /* minor_status */ gss_cred_id_t, /* cred_handle */ @@ -333,7 +333,7 @@ PROTOTYPE( (krb5_context, gss_OID_set * /* mechanisms */ )); -OM_uint32 INTERFACE krb5_gss_inquire_context +OM_uint32 krb5_gss_inquire_context PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -345,6 +345,6 @@ PROTOTYPE( (krb5_context, int* /* locally_initiated */ )); -OM_uint32 INTERFACE kg_get_context(); +OM_uint32 kg_get_context(); #endif /* _GSSAPIP_KRB5_H_ */ diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c index 9b318587f5..4b23217fa5 100644 --- a/src/lib/gssapi/krb5/gssapi_krb5.c +++ b/src/lib/gssapi/krb5/gssapi_krb5.c @@ -73,7 +73,7 @@ static gss_cred_id_t defcred = GSS_C_NO_CREDENTIAL; /* XXX what happens when the default credentials expire or are invalidated? */ -OM_uint32 INTERFACE +OM_uint32 kg_get_defcred(minor_status, cred) OM_uint32 *minor_status; gss_cred_id_t *cred; @@ -99,7 +99,7 @@ kg_get_defcred(minor_status, cred) return(GSS_S_COMPLETE); } -OM_uint32 INTERFACE +OM_uint32 kg_release_defcred(minor_status) OM_uint32 *minor_status; { @@ -114,7 +114,7 @@ kg_release_defcred(minor_status) return(krb5_gss_release_cred(kg_context, minor_status, &defcred)); } -OM_uint32 INTERFACE +OM_uint32 kg_get_context() { if (kg_context) diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h index 1f189773f4..ef84772912 100644 --- a/src/lib/gssapi/krb5/gssapi_krb5.h +++ b/src/lib/gssapi/krb5/gssapi_krb5.h @@ -39,7 +39,7 @@ extern const gss_OID_desc * const gss_nt_krb5_principal; #define gss_krb5_nt_machine_uid_name gss_nt_machine_uid_name #define gss_krb5_nt_string_uid_name gss_nt_string_uid_name -OM_uint32 INTERFACE gss_krb5_get_tkt_flags +OM_uint32 gss_krb5_get_tkt_flags PROTOTYPE((OM_uint32 *minor_status, gss_ctx_id_t context_handle, krb5_flags *ticket_flags)); diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c index 0510a0b8e6..d5dcd20f9d 100644 --- a/src/lib/gssapi/krb5/import_name.c +++ b/src/lib/gssapi/krb5/import_name.c @@ -38,7 +38,7 @@ * GSS_S_FAILURE if memory allocation fails */ -OM_uint32 INTERFACE +OM_uint32 krb5_gss_import_name(context, minor_status, input_name_buffer, input_name_type, output_name) krb5_context context; diff --git a/src/lib/gssapi/krb5/indicate_mechs.c b/src/lib/gssapi/krb5/indicate_mechs.c index 11d94131bb..f100873450 100644 --- a/src/lib/gssapi/krb5/indicate_mechs.c +++ b/src/lib/gssapi/krb5/indicate_mechs.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_indicate_mechs(context, minor_status, mech_set) krb5_context context; OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c index 924d0c94db..0e8bd86c43 100644 --- a/src/lib/gssapi/krb5/init_sec_context.c +++ b/src/lib/gssapi/krb5/init_sec_context.c @@ -147,7 +147,7 @@ make_ap_req(context, auth_context, cred, server, endtime, chan_bindings, return(0); } -OM_uint32 INTERFACE +OM_uint32 krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle, context_handle, target_name, mech_type, req_flags, time_req, input_chan_bindings, @@ -175,7 +175,7 @@ krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle, gss_buffer_desc token; int i; /* Remove this when server is fixed and this function goes away */ -krb5_error_code INTERFACE krb5_auth_con_setkey (); +krb5_error_code krb5_auth_con_setkey (); /* set up return values so they can be "freed" successfully */ diff --git a/src/lib/gssapi/krb5/inq_context.c b/src/lib/gssapi/krb5/inq_context.c index 927483396a..371f3cbe7e 100644 --- a/src/lib/gssapi/krb5/inq_context.c +++ b/src/lib/gssapi/krb5/inq_context.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_inquire_context(context, minor_status, context_handle, initiator_name, acceptor_name, lifetime_rec, mech_type, ret_flags, locally_initiated) diff --git a/src/lib/gssapi/krb5/inq_cred.c b/src/lib/gssapi/krb5/inq_cred.c index fb5346281d..d040018ae2 100644 --- a/src/lib/gssapi/krb5/inq_cred.c +++ b/src/lib/gssapi/krb5/inq_cred.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_inquire_cred(context, minor_status, cred_handle, name, lifetime_ret, cred_usage, mechanisms) krb5_context context; diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c index 0958a8736c..acb37196e8 100644 --- a/src/lib/gssapi/krb5/k5seal.c +++ b/src/lib/gssapi/krb5/k5seal.c @@ -179,7 +179,7 @@ make_seal_token(context, enc_ed, seq_ed, seqnum, direction, text, token, /* if signonly is true, ignore conf_req, conf_state, and do not encode the ENC_TYPE, MSG_LENGTH, or MSG_TEXT fields */ -OM_uint32 INTERFACE +OM_uint32 kg_seal(minor_status, context_handle, conf_req_flag, qop_req, input_message_buffer, conf_state, output_message_buffer, toktype) OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c index 1e9e2580a9..054b5eac77 100644 --- a/src/lib/gssapi/krb5/k5unseal.c +++ b/src/lib/gssapi/krb5/k5unseal.c @@ -28,7 +28,7 @@ conf_state is only valid if SEAL. */ -OM_uint32 INTERFACE +OM_uint32 kg_unseal(minor_status, context_handle, input_token_buffer, message_buffer, conf_state, qop_state, toktype) OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/process_context_token.c b/src/lib/gssapi/krb5/process_context_token.c index 1bea1a5f73..0de7e090ff 100644 --- a/src/lib/gssapi/krb5/process_context_token.c +++ b/src/lib/gssapi/krb5/process_context_token.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_process_context_token(context, minor_status, context_handle, token_buffer) krb5_context context; diff --git a/src/lib/gssapi/krb5/rel_cred.c b/src/lib/gssapi/krb5/rel_cred.c index e976d0a22e..cb5ac0bb4b 100644 --- a/src/lib/gssapi/krb5/rel_cred.c +++ b/src/lib/gssapi/krb5/rel_cred.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_release_cred(context, minor_status, cred_handle) krb5_context context; OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/rel_name.c b/src/lib/gssapi/krb5/rel_name.c index 872746304e..3e41bf43ec 100644 --- a/src/lib/gssapi/krb5/rel_name.c +++ b/src/lib/gssapi/krb5/rel_name.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_release_name(context, minor_status, input_name) krb5_context context; OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/seal.c b/src/lib/gssapi/krb5/seal.c index 645b3d6385..a0e06ebdee 100644 --- a/src/lib/gssapi/krb5/seal.c +++ b/src/lib/gssapi/krb5/seal.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_seal(context, minor_status, context_handle, conf_req_flag, qop_req, input_message_buffer, conf_state, output_message_buffer) diff --git a/src/lib/gssapi/krb5/sign.c b/src/lib/gssapi/krb5/sign.c index 368d7f81dc..bafc0837d2 100644 --- a/src/lib/gssapi/krb5/sign.c +++ b/src/lib/gssapi/krb5/sign.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_sign(context, minor_status, context_handle, qop_req, message_buffer, message_token) diff --git a/src/lib/gssapi/krb5/unseal.c b/src/lib/gssapi/krb5/unseal.c index f7aa994b11..3449951af3 100644 --- a/src/lib/gssapi/krb5/unseal.c +++ b/src/lib/gssapi/krb5/unseal.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_unseal(context, minor_status, context_handle, input_message_buffer, output_message_buffer, conf_state, qop_state) diff --git a/src/lib/gssapi/krb5/util_cksum.c b/src/lib/gssapi/krb5/util_cksum.c index d5c12aab2c..99f8c3bef8 100644 --- a/src/lib/gssapi/krb5/util_cksum.c +++ b/src/lib/gssapi/krb5/util_cksum.c @@ -23,7 +23,7 @@ #include "gssapiP_krb5.h" #include <memory.h> -krb5_error_code INTERFACE +krb5_error_code kg_checksum_channel_bindings(cb, cksum, bigend) gss_channel_bindings_t cb; krb5_checksum *cksum; diff --git a/src/lib/gssapi/krb5/util_crypt.c b/src/lib/gssapi/krb5/util_crypt.c index a53b7c2ce9..89028270e3 100644 --- a/src/lib/gssapi/krb5/util_crypt.c +++ b/src/lib/gssapi/krb5/util_crypt.c @@ -25,7 +25,7 @@ static unsigned char zeros[8] = {0,0,0,0,0,0,0,0}; -int INTERFACE +int kg_confounder_size(ed) krb5_gss_enc_desc *ed; { @@ -34,7 +34,7 @@ kg_confounder_size(ed) return(ed->eblock.crypto_entry->block_length); } -krb5_error_code INTERFACE +krb5_error_code kg_make_confounder(ed, buf) krb5_gss_enc_desc *ed; unsigned char *buf; @@ -42,7 +42,7 @@ kg_make_confounder(ed, buf) return(krb5_random_confounder( ed->eblock.crypto_entry->block_length, buf)); } -int INTERFACE +int kg_encrypt_size(ed, n) krb5_gss_enc_desc *ed; int n; @@ -50,7 +50,7 @@ kg_encrypt_size(ed, n) return(krb5_encrypt_size(n, ed->eblock.crypto_entry)); } -krb5_error_code INTERFACE +krb5_error_code kg_encrypt(ed, iv, in, out, length) krb5_gss_enc_desc *ed; krb5_pointer iv; @@ -78,7 +78,7 @@ kg_encrypt(ed, iv, in, out, length) /* length is the length of the cleartext. */ -krb5_error_code INTERFACE +krb5_error_code kg_decrypt(ed, iv, in, out, length) krb5_gss_enc_desc *ed; krb5_pointer iv; diff --git a/src/lib/gssapi/krb5/util_seed.c b/src/lib/gssapi/krb5/util_seed.c index 318a49b8c7..8792b8bd94 100644 --- a/src/lib/gssapi/krb5/util_seed.c +++ b/src/lib/gssapi/krb5/util_seed.c @@ -25,7 +25,7 @@ static unsigned char zeros[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0}; -krb5_error_code INTERFACE +krb5_error_code kg_make_seed(key, seed) krb5_keyblock *key; unsigned char *seed; diff --git a/src/lib/gssapi/krb5/util_seqnum.c b/src/lib/gssapi/krb5/util_seqnum.c index 7a9d31b5a9..67bcda6db1 100644 --- a/src/lib/gssapi/krb5/util_seqnum.c +++ b/src/lib/gssapi/krb5/util_seqnum.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -krb5_error_code INTERFACE +krb5_error_code kg_make_seq_num(ed, direction, seqnum, cksum, buf) krb5_gss_enc_desc *ed; int direction; diff --git a/src/lib/gssapi/krb5/verify.c b/src/lib/gssapi/krb5/verify.c index df0316aa85..398b1d7717 100644 --- a/src/lib/gssapi/krb5/verify.c +++ b/src/lib/gssapi/krb5/verify.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_verify(context, minor_status, context_handle, message_buffer, token_buffer, qop_state) |