From 9c9f46eeed8ecbd816732d49d3f6ba9a5649fe71 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Sat, 10 Sep 2011 18:45:48 +0100 Subject: [PATCH] use GSSAPI_CALLCONV for exported SPIs --- mech_eap/accept_sec_context.c | 2 +- mech_eap/acquire_cred.c | 2 +- mech_eap/acquire_cred_with_password.c | 2 +- mech_eap/add_cred.c | 2 +- mech_eap/add_cred_with_password.c | 2 +- mech_eap/authorize_localname.c | 2 +- mech_eap/canonicalize_name.c | 2 +- mech_eap/compare_name.c | 2 +- mech_eap/context_time.c | 2 +- mech_eap/delete_name_attribute.c | 2 +- mech_eap/delete_sec_context.c | 2 +- mech_eap/display_name.c | 2 +- mech_eap/display_name_ext.c | 2 +- mech_eap/display_status.c | 2 +- mech_eap/duplicate_name.c | 2 +- mech_eap/export_name.c | 2 +- mech_eap/export_name_composite.c | 2 +- mech_eap/export_sec_context.c | 2 +- mech_eap/get_mic.c | 2 +- mech_eap/get_name_attribute.c | 2 +- mech_eap/import_name.c | 2 +- mech_eap/import_sec_context.c | 2 +- mech_eap/indicate_mechs.c | 2 +- mech_eap/init_sec_context.c | 2 +- mech_eap/inquire_attrs_for_mech.c | 2 +- mech_eap/inquire_context.c | 2 +- mech_eap/inquire_cred.c | 2 +- mech_eap/inquire_cred_by_mech.c | 2 +- mech_eap/inquire_cred_by_oid.c | 2 +- mech_eap/inquire_mech_for_saslname.c | 2 +- mech_eap/inquire_mechs_for_name.c | 2 +- mech_eap/inquire_name.c | 11 ++++++----- mech_eap/inquire_names_for_mech.c | 2 +- mech_eap/inquire_saslname_for_mech.c | 2 +- mech_eap/inquire_sec_context_by_oid.c | 2 +- mech_eap/map_name_to_any.c | 2 +- mech_eap/mech_invoke.c | 2 +- mech_eap/process_context_token.c | 2 +- mech_eap/pseudo_random.c | 2 +- mech_eap/release_any_name_mapping.c | 2 +- mech_eap/release_cred.c | 2 +- mech_eap/release_name.c | 2 +- mech_eap/release_oid.c | 2 +- mech_eap/set_cred_option.c | 2 +- mech_eap/set_name_attribute.c | 2 +- mech_eap/set_sec_context_option.c | 2 +- mech_eap/store_cred.c | 2 +- mech_eap/unwrap.c | 2 +- mech_eap/unwrap_iov.c | 2 +- mech_eap/util.h | 4 ++++ mech_eap/verify_mic.c | 2 +- mech_eap/wrap.c | 2 +- mech_eap/wrap_iov.c | 2 +- mech_eap/wrap_iov_length.c | 2 +- mech_eap/wrap_size_limit.c | 2 +- 55 files changed, 63 insertions(+), 58 deletions(-) diff --git a/mech_eap/accept_sec_context.c b/mech_eap/accept_sec_context.c index 21ce614..afcd4d3 100644 --- a/mech_eap/accept_sec_context.c +++ b/mech_eap/accept_sec_context.c @@ -858,7 +858,7 @@ static struct gss_eap_sm eapGssAcceptorSm[] = { }, }; -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_accept_sec_context(OM_uint32 *minor, gss_ctx_id_t *context_handle, gss_cred_id_t cred, diff --git a/mech_eap/acquire_cred.c b/mech_eap/acquire_cred.c index 9e3f027..ae2648e 100644 --- a/mech_eap/acquire_cred.c +++ b/mech_eap/acquire_cred.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_acquire_cred(OM_uint32 *minor, gss_name_t desired_name, OM_uint32 time_req, diff --git a/mech_eap/acquire_cred_with_password.c b/mech_eap/acquire_cred_with_password.c index 466473b..8e08358 100644 --- a/mech_eap/acquire_cred_with_password.c +++ b/mech_eap/acquire_cred_with_password.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gssspi_acquire_cred_with_password(OM_uint32 *minor, const gss_name_t desired_name, const gss_buffer_t password, diff --git a/mech_eap/add_cred.c b/mech_eap/add_cred.c index f1598ed..64d97c0 100644 --- a/mech_eap/add_cred.c +++ b/mech_eap/add_cred.c @@ -41,7 +41,7 @@ * apart from the mechanism glue layer. However, Heimdal does call into the * mechanism here. */ -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_add_cred(OM_uint32 *minor, gss_cred_id_t input_cred_handle GSSEAP_UNUSED, gss_name_t desired_name, diff --git a/mech_eap/add_cred_with_password.c b/mech_eap/add_cred_with_password.c index f634f96..b982f0d 100644 --- a/mech_eap/add_cred_with_password.c +++ b/mech_eap/add_cred_with_password.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_add_cred_with_password(OM_uint32 *minor, const gss_cred_id_t input_cred_handle GSSEAP_UNUSED, const gss_name_t desired_name, diff --git a/mech_eap/authorize_localname.c b/mech_eap/authorize_localname.c index ef5788e..0037e2b 100644 --- a/mech_eap/authorize_localname.c +++ b/mech_eap/authorize_localname.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gssspi_authorize_localname(OM_uint32 *minor, const gss_name_t name GSSEAP_UNUSED, gss_const_buffer_t local_user GSSEAP_UNUSED, diff --git a/mech_eap/canonicalize_name.c b/mech_eap/canonicalize_name.c index 82d96b6..5e66798 100644 --- a/mech_eap/canonicalize_name.c +++ b/mech_eap/canonicalize_name.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_canonicalize_name(OM_uint32 *minor, const gss_name_t input_name, const gss_OID mech_type, diff --git a/mech_eap/compare_name.c b/mech_eap/compare_name.c index 1da4d98..edadf3e 100644 --- a/mech_eap/compare_name.c +++ b/mech_eap/compare_name.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_compare_name(OM_uint32 *minor, gss_name_t name1, gss_name_t name2, diff --git a/mech_eap/context_time.c b/mech_eap/context_time.c index 1486065..ae47d6c 100644 --- a/mech_eap/context_time.c +++ b/mech_eap/context_time.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_context_time(OM_uint32 *minor, gss_ctx_id_t ctx, OM_uint32 *time_rec) diff --git a/mech_eap/delete_name_attribute.c b/mech_eap/delete_name_attribute.c index 88cade3..fe0ff8f 100644 --- a/mech_eap/delete_name_attribute.c +++ b/mech_eap/delete_name_attribute.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_delete_name_attribute(OM_uint32 *minor, gss_name_t name, gss_buffer_t attr) diff --git a/mech_eap/delete_sec_context.c b/mech_eap/delete_sec_context.c index 7bd9cfb..ab3c54f 100644 --- a/mech_eap/delete_sec_context.c +++ b/mech_eap/delete_sec_context.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_delete_sec_context(OM_uint32 *minor, gss_ctx_id_t *context_handle, gss_buffer_t output_token) diff --git a/mech_eap/display_name.c b/mech_eap/display_name.c index 427dcf2..2d87e66 100644 --- a/mech_eap/display_name.c +++ b/mech_eap/display_name.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_display_name(OM_uint32 *minor, gss_name_t name, gss_buffer_t output_name_buffer, diff --git a/mech_eap/display_name_ext.c b/mech_eap/display_name_ext.c index dff525f..d6791d4 100644 --- a/mech_eap/display_name_ext.c +++ b/mech_eap/display_name_ext.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_display_name_ext(OM_uint32 *minor, gss_name_t name GSSEAP_UNUSED, gss_OID display_as_name_type GSSEAP_UNUSED, diff --git a/mech_eap/display_status.c b/mech_eap/display_status.c index 584eac9..78738ff 100644 --- a/mech_eap/display_status.c +++ b/mech_eap/display_status.c @@ -140,7 +140,7 @@ gssEapSaveStatusInfo(OM_uint32 minor, const char *format, ...) saveStatusInfoNoCopy(minor, s); } -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_display_status(OM_uint32 *minor, OM_uint32 status_value, int status_type, diff --git a/mech_eap/duplicate_name.c b/mech_eap/duplicate_name.c index b618b3d..303619e 100644 --- a/mech_eap/duplicate_name.c +++ b/mech_eap/duplicate_name.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_duplicate_name(OM_uint32 *minor, const gss_name_t input_name, gss_name_t *dest_name) diff --git a/mech_eap/export_name.c b/mech_eap/export_name.c index 7a37e30..d91033f 100644 --- a/mech_eap/export_name.c +++ b/mech_eap/export_name.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_export_name(OM_uint32 *minor, const gss_name_t input_name, gss_buffer_t exported_name) diff --git a/mech_eap/export_name_composite.c b/mech_eap/export_name_composite.c index 7fb9840..b2a90ae 100644 --- a/mech_eap/export_name_composite.c +++ b/mech_eap/export_name_composite.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_export_name_composite(OM_uint32 *minor, gss_name_t input_name, gss_buffer_t exported_name) diff --git a/mech_eap/export_sec_context.c b/mech_eap/export_sec_context.c index 43f3f28..8695bf6 100644 --- a/mech_eap/export_sec_context.c +++ b/mech_eap/export_sec_context.c @@ -208,7 +208,7 @@ cleanup: return major; } -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_export_sec_context(OM_uint32 *minor, gss_ctx_id_t *context_handle, gss_buffer_t interprocess_token) diff --git a/mech_eap/get_mic.c b/mech_eap/get_mic.c index c19e68f..7161e9c 100644 --- a/mech_eap/get_mic.c +++ b/mech_eap/get_mic.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_get_mic(OM_uint32 *minor, gss_ctx_id_t ctx, gss_qop_t qop_req, diff --git a/mech_eap/get_name_attribute.c b/mech_eap/get_name_attribute.c index 8273368..a885823 100644 --- a/mech_eap/get_name_attribute.c +++ b/mech_eap/get_name_attribute.c @@ -36,7 +36,7 @@ * Wrapper for retrieving a naming attribute. */ -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_get_name_attribute(OM_uint32 *minor, gss_name_t name, gss_buffer_t attr, diff --git a/mech_eap/import_name.c b/mech_eap/import_name.c index 87f0830..8049e01 100644 --- a/mech_eap/import_name.c +++ b/mech_eap/import_name.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_import_name(OM_uint32 *minor, gss_buffer_t import_name_buffer, gss_OID input_name_type, diff --git a/mech_eap/import_sec_context.c b/mech_eap/import_sec_context.c index d571bca..9d6ae3d 100644 --- a/mech_eap/import_sec_context.c +++ b/mech_eap/import_sec_context.c @@ -325,7 +325,7 @@ gssEapImportContext(OM_uint32 *minor, return major; } -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_import_sec_context(OM_uint32 *minor, gss_buffer_t interprocess_token, gss_ctx_id_t *context_handle) diff --git a/mech_eap/indicate_mechs.c b/mech_eap/indicate_mechs.c index ff88b4d..d4d275e 100644 --- a/mech_eap/indicate_mechs.c +++ b/mech_eap/indicate_mechs.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_indicate_mechs(OM_uint32 *minor, gss_OID_set *mech_set) { diff --git a/mech_eap/init_sec_context.c b/mech_eap/init_sec_context.c index 061bd38..23795fc 100644 --- a/mech_eap/init_sec_context.c +++ b/mech_eap/init_sec_context.c @@ -943,7 +943,7 @@ static struct gss_eap_sm eapGssInitiatorSm[] = { } }; -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_init_sec_context(OM_uint32 *minor, gss_cred_id_t cred, gss_ctx_id_t *context_handle, diff --git a/mech_eap/inquire_attrs_for_mech.c b/mech_eap/inquire_attrs_for_mech.c index b85953b..a359f68 100644 --- a/mech_eap/inquire_attrs_for_mech.c +++ b/mech_eap/inquire_attrs_for_mech.c @@ -45,7 +45,7 @@ #define MA_SUPPORTED(ma) MA_ADD((ma), mech_attrs) #define MA_KNOWN(ma) MA_ADD((ma), known_mech_attrs) -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_inquire_attrs_for_mech(OM_uint32 *minor, gss_const_OID mech_oid, gss_OID_set *mech_attrs, diff --git a/mech_eap/inquire_context.c b/mech_eap/inquire_context.c index 0e7b586..d37818d 100644 --- a/mech_eap/inquire_context.c +++ b/mech_eap/inquire_context.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_inquire_context(OM_uint32 *minor, gss_ctx_id_t ctx, gss_name_t *src_name, diff --git a/mech_eap/inquire_cred.c b/mech_eap/inquire_cred.c index 6c0114b..227ab16 100644 --- a/mech_eap/inquire_cred.c +++ b/mech_eap/inquire_cred.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_inquire_cred(OM_uint32 *minor, gss_cred_id_t cred, gss_name_t *name, diff --git a/mech_eap/inquire_cred_by_mech.c b/mech_eap/inquire_cred_by_mech.c index 24da201..191902d 100644 --- a/mech_eap/inquire_cred_by_mech.c +++ b/mech_eap/inquire_cred_by_mech.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_inquire_cred_by_mech(OM_uint32 *minor, gss_cred_id_t cred, gss_OID mech_type, diff --git a/mech_eap/inquire_cred_by_oid.c b/mech_eap/inquire_cred_by_oid.c index b4a95f8..3898f8c 100644 --- a/mech_eap/inquire_cred_by_oid.c +++ b/mech_eap/inquire_cred_by_oid.c @@ -43,7 +43,7 @@ static struct { } inquireCredOps[] = { }; -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_inquire_cred_by_oid(OM_uint32 *minor, const gss_cred_id_t cred_handle, const gss_OID desired_object, diff --git a/mech_eap/inquire_mech_for_saslname.c b/mech_eap/inquire_mech_for_saslname.c index c2f7914..bd518c0 100644 --- a/mech_eap/inquire_mech_for_saslname.c +++ b/mech_eap/inquire_mech_for_saslname.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_inquire_saslname_for_mech(OM_uint32 *minor, const gss_OID mech, gss_buffer_t sasl_mech_name, diff --git a/mech_eap/inquire_mechs_for_name.c b/mech_eap/inquire_mechs_for_name.c index ca5d365..89c869c 100644 --- a/mech_eap/inquire_mechs_for_name.c +++ b/mech_eap/inquire_mechs_for_name.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_inquire_mechs_for_name(OM_uint32 *minor, const gss_name_t input_name, gss_OID_set *mech_types) diff --git a/mech_eap/inquire_name.c b/mech_eap/inquire_name.c index 2a4e0e3..78b08a0 100644 --- a/mech_eap/inquire_name.c +++ b/mech_eap/inquire_name.c @@ -36,11 +36,12 @@ #include "gssapiP_eap.h" -OM_uint32 gss_inquire_name(OM_uint32 *minor, - gss_name_t name, - int *name_is_MN, - gss_OID *MN_mech, - gss_buffer_set_t *attrs) +OM_uint32 GSSAPI_CALLCONV +gss_inquire_name(OM_uint32 *minor, + gss_name_t name, + int *name_is_MN, + gss_OID *MN_mech, + gss_buffer_set_t *attrs) { OM_uint32 major, tmpMinor; diff --git a/mech_eap/inquire_names_for_mech.c b/mech_eap/inquire_names_for_mech.c index e01740a..0e60340 100644 --- a/mech_eap/inquire_names_for_mech.c +++ b/mech_eap/inquire_names_for_mech.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_inquire_names_for_mech(OM_uint32 *minor, gss_OID mechanism, gss_OID_set *ret_name_types) diff --git a/mech_eap/inquire_saslname_for_mech.c b/mech_eap/inquire_saslname_for_mech.c index aec2a85..d6d7c14 100644 --- a/mech_eap/inquire_saslname_for_mech.c +++ b/mech_eap/inquire_saslname_for_mech.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_inquire_mech_for_saslname(OM_uint32 *minor, const gss_buffer_t sasl_mech_name, gss_OID *mech_type) diff --git a/mech_eap/inquire_sec_context_by_oid.c b/mech_eap/inquire_sec_context_by_oid.c index a69b9e9..67b2ec8 100644 --- a/mech_eap/inquire_sec_context_by_oid.c +++ b/mech_eap/inquire_sec_context_by_oid.c @@ -104,7 +104,7 @@ static struct { }, }; -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_inquire_sec_context_by_oid(OM_uint32 *minor, const gss_ctx_id_t ctx, const gss_OID desired_object, diff --git a/mech_eap/map_name_to_any.c b/mech_eap/map_name_to_any.c index 6f952e3..2a8a96c 100644 --- a/mech_eap/map_name_to_any.c +++ b/mech_eap/map_name_to_any.c @@ -32,7 +32,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_map_name_to_any(OM_uint32 *minor, gss_name_t name, int authenticated, diff --git a/mech_eap/mech_invoke.c b/mech_eap/mech_invoke.c index 2b7fb7e..bc9bba3 100644 --- a/mech_eap/mech_invoke.c +++ b/mech_eap/mech_invoke.c @@ -32,7 +32,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gssspi_mech_invoke(OM_uint32 *minor, const gss_OID desired_mech, const gss_OID desired_object, diff --git a/mech_eap/process_context_token.c b/mech_eap/process_context_token.c index 5bad3c0..02a4b6d 100644 --- a/mech_eap/process_context_token.c +++ b/mech_eap/process_context_token.c @@ -32,7 +32,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_process_context_token(OM_uint32 *minor, gss_ctx_id_t ctx, gss_buffer_t token_buffer) diff --git a/mech_eap/pseudo_random.c b/mech_eap/pseudo_random.c index 4bbf542..a90d972 100644 --- a/mech_eap/pseudo_random.c +++ b/mech_eap/pseudo_random.c @@ -59,7 +59,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_pseudo_random(OM_uint32 *minor, gss_ctx_id_t ctx, int prf_key, diff --git a/mech_eap/release_any_name_mapping.c b/mech_eap/release_any_name_mapping.c index 54d3162..d68fb45 100644 --- a/mech_eap/release_any_name_mapping.c +++ b/mech_eap/release_any_name_mapping.c @@ -32,7 +32,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_release_any_name_mapping(OM_uint32 *minor, gss_name_t name, gss_buffer_t type_id, diff --git a/mech_eap/release_cred.c b/mech_eap/release_cred.c index 57ba829..8bb7e54 100644 --- a/mech_eap/release_cred.c +++ b/mech_eap/release_cred.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_release_cred(OM_uint32 *minor, gss_cred_id_t *cred_handle) { diff --git a/mech_eap/release_name.c b/mech_eap/release_name.c index fb267a5..3d527ce 100644 --- a/mech_eap/release_name.c +++ b/mech_eap/release_name.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_release_name(OM_uint32 *minor, gss_name_t *name) { diff --git a/mech_eap/release_oid.c b/mech_eap/release_oid.c index 4e0d4f0..291da40 100644 --- a/mech_eap/release_oid.c +++ b/mech_eap/release_oid.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_internal_release_oid(OM_uint32 *minor, gss_OID *oid) { diff --git a/mech_eap/set_cred_option.c b/mech_eap/set_cred_option.c index dd87a1f..03c95fd 100644 --- a/mech_eap/set_cred_option.c +++ b/mech_eap/set_cred_option.c @@ -138,7 +138,7 @@ gss_OID GSS_EAP_CRED_SET_RADIUS_CONFIG_FILE = &setCredOps[0].oid; gss_OID GSS_EAP_CRED_SET_RADIUS_CONFIG_STANZA = &setCredOps[1].oid; gss_OID GSS_EAP_CRED_SET_CRED_FLAG = &setCredOps[2].oid; -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gssspi_set_cred_option(OM_uint32 *minor, gss_cred_id_t *pCred, const gss_OID desired_object, diff --git a/mech_eap/set_name_attribute.c b/mech_eap/set_name_attribute.c index 6dd9434..2ccf5d7 100644 --- a/mech_eap/set_name_attribute.c +++ b/mech_eap/set_name_attribute.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_set_name_attribute(OM_uint32 *minor, gss_name_t name, int complete, diff --git a/mech_eap/set_sec_context_option.c b/mech_eap/set_sec_context_option.c index 45ef266..118d2d2 100644 --- a/mech_eap/set_sec_context_option.c +++ b/mech_eap/set_sec_context_option.c @@ -43,7 +43,7 @@ static struct { } setCtxOps[] = { }; -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_set_sec_context_option(OM_uint32 *minor, gss_ctx_id_t *pCtx, const gss_OID desired_object, diff --git a/mech_eap/store_cred.c b/mech_eap/store_cred.c index 2847f42..d17a3ac 100644 --- a/mech_eap/store_cred.c +++ b/mech_eap/store_cred.c @@ -32,7 +32,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_store_cred(OM_uint32 *minor, const gss_cred_id_t cred, gss_cred_usage_t input_usage, diff --git a/mech_eap/unwrap.c b/mech_eap/unwrap.c index ae35bf9..a185035 100644 --- a/mech_eap/unwrap.c +++ b/mech_eap/unwrap.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_unwrap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_buffer_t input_message_buffer, diff --git a/mech_eap/unwrap_iov.c b/mech_eap/unwrap_iov.c index 2156e51..9e3ef19 100644 --- a/mech_eap/unwrap_iov.c +++ b/mech_eap/unwrap_iov.c @@ -528,7 +528,7 @@ gssEapUnwrapOrVerifyMIC(OM_uint32 *minor, return major; } -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_unwrap_iov(OM_uint32 *minor, gss_ctx_id_t ctx, int *conf_state, diff --git a/mech_eap/util.h b/mech_eap/util.h index 2242735..4c0756e 100644 --- a/mech_eap/util.h +++ b/mech_eap/util.h @@ -744,6 +744,10 @@ verifyTokenHeader(OM_uint32 *minor, #define GSSEAP_FREE free #define GSSEAP_REALLOC realloc +#ifndef GSSAPI_CALLCONV +#define GSSAPI_CALLCONV KRB5_CALLCONV +#endif + #define GSSEAP_NOT_IMPLEMENTED do { \ assert(0 && "not implemented"); \ *minor = ENOSYS; \ diff --git a/mech_eap/verify_mic.c b/mech_eap/verify_mic.c index 0a56949..d72c57e 100644 --- a/mech_eap/verify_mic.c +++ b/mech_eap/verify_mic.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_verify_mic(OM_uint32 *minor, gss_ctx_id_t ctx, gss_buffer_t message_buffer, diff --git a/mech_eap/wrap.c b/mech_eap/wrap.c index a89bcb6..2e27fb3 100644 --- a/mech_eap/wrap.c +++ b/mech_eap/wrap.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_wrap(OM_uint32 *minor, gss_ctx_id_t ctx, int conf_req_flag, diff --git a/mech_eap/wrap_iov.c b/mech_eap/wrap_iov.c index 31450fc..a40b980 100644 --- a/mech_eap/wrap_iov.c +++ b/mech_eap/wrap_iov.c @@ -336,7 +336,7 @@ cleanup: return (code == 0) ? GSS_S_COMPLETE : GSS_S_FAILURE; } -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_wrap_iov(OM_uint32 *minor, gss_ctx_id_t ctx, int conf_req_flag, diff --git a/mech_eap/wrap_iov_length.c b/mech_eap/wrap_iov_length.c index 229fec7..65bb6ec 100644 --- a/mech_eap/wrap_iov_length.c +++ b/mech_eap/wrap_iov_length.c @@ -196,7 +196,7 @@ gssEapWrapIovLength(OM_uint32 *minor, return GSS_S_COMPLETE; } -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_wrap_iov_length(OM_uint32 *minor, gss_ctx_id_t ctx, int conf_req_flag, diff --git a/mech_eap/wrap_size_limit.c b/mech_eap/wrap_size_limit.c index aadf1b4..d11fd63 100644 --- a/mech_eap/wrap_size_limit.c +++ b/mech_eap/wrap_size_limit.c @@ -36,7 +36,7 @@ #include "gssapiP_eap.h" -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_wrap_size_limit(OM_uint32 *minor, gss_ctx_id_t ctx, int conf_req_flag, -- 2.1.4