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

plugin interface functions must specify calling convention

Browse Source 
The plugin interfaces were originally implemented for use on
Unix where KRB5_CALLCONV, HEIM_CALLCONV and similar are defined
as nothing.  However, on 32-bit Windows the calling convention
matters and executing a __stdcall function through a __cdecl
function pointer will result in failures.

This change updates the krb5plugin_windc, krb5plugin_service_locate,
krb5plugin_send_to_kdc plugins to specify the KRB5_CALLCONV for
functions.   This brings the plugins into compliance with the
heim_plugin_common interface requirement that init() and fini()
use the platform specified HEIM_CALLCONV.

The krb5-plugin(7) man page is updated and the lib/krb5/test_plugin
test is also fixed.

With this change all tests pass on 32-bit Windows.

Change-Id: Ic9d2e1285c9c179e3898dc9d071ed092bcddc406
This commit is contained in:
Jeffrey Altman
2021-11-18 09:16:45 -05:00
committed by Nico Williams
parent 357a38fc7f
commit 6cfbde4d86
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/krb5/send_to_kdc_plugin.h
View File

@@ -45,14 +45,14 @@
#define KRB5_PLUGIN_SEND_TO_KDC_VERSION KRB5_PLUGIN_SEND_TO_KDC_VERSION_2
typedef krb5_error_code
(*krb5plugin_send_to_kdc_func)(krb5_context,
(KRB5_CALLCONV *krb5plugin_send_to_kdc_func)(krb5_context,
void *,
krb5_krbhst_info *,
time_t timeout,
const krb5_data *,
krb5_data *);
typedef krb5_error_code
(*krb5plugin_send_to_realm_func)(krb5_context,
(KRB5_CALLCONV *krb5plugin_send_to_realm_func)(krb5_context,
void *,
krb5_const_realm,
time_t timeout,
@@ -62,8 +62,8 @@ typedef krb5_error_code
typedef struct krb5plugin_send_to_kdc_ftable {
int minor_version;
krb5_error_code (*init)(krb5_context, void **);
void (*fini)(void *);
krb5_error_code (KRB5_CALLCONV *init)(krb5_context, void **);
void (KRB5_CALLCONV *fini)(void *);
krb5plugin_send_to_kdc_func send_to_kdc;
krb5plugin_send_to_realm_func send_to_realm; /* added in version 2 */
} krb5plugin_send_to_kdc_ftable;