tyler.durden
/
Win32-OpenSSH
mirror of https://github.com/PowerShell/Win32-OpenSSH.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Back out kerberos prototype changes 

Looks like the changes work for visual studio, but broke mingw.
This commit is contained in:
dkulwin 2015-11-05 14:03:33 -06:00
parent 99a38147f7
commit 44510dc67e
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/win32/win32compat/kerberos.c
View File

@ -166,38 +166,38 @@ void UninitMitKerberos()
* KfW libs here. * KfW libs here.
*/ */
OM_uint32 KRB5_CALLCONV gss_indicate_mechs(OM_uint32 *a, gss_OID_set *b) KFW_CALL gss_indicate_mechs(OM_uint32 *a, gss_OID_set *b)
{ {
return MitDispatch.gss_indicate_mechs(a, b); return MitDispatch.gss_indicate_mechs(a, b);
} }
OM_uint32 KRB5_CALLCONV gss_release_buffer(OM_uint32 *a, gss_buffer_t b) KFW_CALL gss_release_buffer(OM_uint32 *a, gss_buffer_t b)
{ {
return MitDispatch.gss_release_buffer(a, b); return MitDispatch.gss_release_buffer(a, b);
} }
OM_uint32 KRB5_CALLCONV gss_display_status(OM_uint32 *a, OM_uint32 b, int c, gss_OID d, KFW_CALL gss_display_status(OM_uint32 *a, OM_uint32 b, int c, gss_OID d,
OM_uint32 *e, gss_buffer_t f) OM_uint32 *e, gss_buffer_t f)
{ {
return MitDispatch.gss_display_status(a, b, c, d, e, f); return MitDispatch.gss_display_status(a, b, c, d, e, f);
} }
OM_uint32 KRB5_CALLCONV gss_delete_sec_context(OM_uint32 *a, gss_ctx_id_t *b, gss_buffer_t c) KFW_CALL gss_delete_sec_context(OM_uint32 *a, gss_ctx_id_t *b, gss_buffer_t c)
{ {
return MitDispatch.gss_delete_sec_context(a, b, c); return MitDispatch.gss_delete_sec_context(a, b, c);
} }
OM_uint32 KRB5_CALLCONV gss_release_name(OM_uint32 *a, gss_name_t *b) KFW_CALL gss_release_name(OM_uint32 *a, gss_name_t *b)
{ {
return MitDispatch.gss_release_name(a, b); return MitDispatch.gss_release_name(a, b);
} }
OM_uint32 KRB5_CALLCONV gss_release_cred(OM_uint32 *a, gss_cred_id_t *b) KFW_CALL gss_release_cred(OM_uint32 *a, gss_cred_id_t *b)
{ {
return MitDispatch.gss_release_cred(a, b); return MitDispatch.gss_release_cred(a, b);
} }
OM_uint32 KRB5_CALLCONV gss_init_sec_context(OM_uint32 *a, gss_cred_id_t b, KFW_CALL gss_init_sec_context(OM_uint32 *a, gss_cred_id_t b,
gss_ctx_id_t *c, gss_name_t d, gss_ctx_id_t *c, gss_name_t d,
gss_OID e, OM_uint32 f, gss_OID e, OM_uint32 f,
OM_uint32 g, gss_channel_bindings_t h, OM_uint32 g, gss_channel_bindings_t h,
@ -208,12 +208,12 @@ OM_uint32 KRB5_CALLCONV gss_init_sec_context(OM_uint32 *a, gss_cred_id_t b,
return MitDispatch.gss_init_sec_context(a, b, c, d, e, f, g, h, i, j, k, l, m); return MitDispatch.gss_init_sec_context(a, b, c, d, e, f, g, h, i, j, k, l, m);
} }
OM_uint32 KRB5_CALLCONV gss_import_name(OM_uint32 *a, gss_buffer_t b, gss_OID c, gss_name_t *d) KFW_CALL gss_import_name(OM_uint32 *a, gss_buffer_t b, gss_OID c, gss_name_t *d)
{ {
return MitDispatch.gss_import_name(a, b, c, d); return MitDispatch.gss_import_name(a, b, c, d);
} }
OM_uint32 KRB5_CALLCONV gss_get_mic(OM_uint32 *a, gss_ctx_id_t b, gss_qop_t c, KFW_CALL gss_get_mic(OM_uint32 *a, gss_ctx_id_t b, gss_qop_t c,
gss_buffer_t d, gss_buffer_t e) gss_buffer_t d, gss_buffer_t e)
{ {
return MitDispatch.gss_get_mic(a, b, c, d, e); return MitDispatch.gss_get_mic(a, b, c, d, e);

27
contrib/win32/win32compat/kerberos.h
View File

@ -55,22 +55,21 @@ void UninitMitKerberos();
* needed by ssh client here. * needed by ssh client here.
*/ */
#define KFW_CALL OM_uint32 KRB5_CALLCONV
typedef OM_uint32 _stdcall KFW_CALL; typedef KFW_CALL (*gss_indicate_mechs_ptr)(OM_uint32 *, gss_OID_set *);
typedef KFW_CALL (*gss_release_buffer_ptr)(OM_uint32 *, gss_buffer_t);
typedef OM_uint32 (KRB5_CALLCONV *gss_indicate_mechs_ptr)(OM_uint32 *, gss_OID_set *); typedef KFW_CALL (*gss_display_status_ptr)(OM_uint32 *, OM_uint32, int,
typedef OM_uint32(KRB5_CALLCONV *gss_release_buffer_ptr)(OM_uint32 *, gss_buffer_t);
typedef OM_uint32(KRB5_CALLCONV *gss_display_status_ptr)(OM_uint32 *, OM_uint32, int,
gss_OID, OM_uint32 *, gss_buffer_t); gss_OID, OM_uint32 *, gss_buffer_t);
typedef OM_uint32(KRB5_CALLCONV *gss_delete_sec_context_ptr)(OM_uint32 *, gss_ctx_id_t *, typedef KFW_CALL (*gss_delete_sec_context_ptr)(OM_uint32 *, gss_ctx_id_t *,
gss_buffer_t); gss_buffer_t);
typedef OM_uint32(KRB5_CALLCONV *gss_release_name_ptr)(OM_uint32 *, gss_name_t *); typedef KFW_CALL (*gss_release_name_ptr)(OM_uint32 *, gss_name_t *);
typedef OM_uint32(KRB5_CALLCONV *gss_release_cred_ptr)(OM_uint32 *, gss_cred_id_t *); typedef KFW_CALL (*gss_release_cred_ptr)(OM_uint32 *, gss_cred_id_t *);
typedef OM_uint32(KRB5_CALLCONV *gss_init_sec_context_ptr)(OM_uint32 *, gss_cred_id_t, typedef KFW_CALL (*gss_init_sec_context_ptr)(OM_uint32 *, gss_cred_id_t,
gss_ctx_id_t *, gss_name_t, gss_ctx_id_t *, gss_name_t,
gss_OID, OM_uint32, OM_uint32, gss_OID, OM_uint32, OM_uint32,
gss_channel_bindings_t, gss_channel_bindings_t,
@ -78,19 +77,19 @@ typedef OM_uint32(KRB5_CALLCONV *gss_init_sec_context_ptr)(OM_uint32 *, gss_cred
gss_buffer_t, OM_uint32 *, gss_buffer_t, OM_uint32 *,
OM_uint32 *); OM_uint32 *);
typedef OM_uint32(KRB5_CALLCONV *gss_import_name_ptr)(OM_uint32 *, gss_buffer_t, typedef KFW_CALL (*gss_import_name_ptr)(OM_uint32 *, gss_buffer_t,
gss_OID, gss_name_t *); gss_OID, gss_name_t *);
typedef OM_uint32 (KRB5_CALLCONV *gss_get_mic_ptr)(OM_uint32 *, gss_ctx_id_t, typedef OM_uint32 KRB5_CALLCONV (*gss_get_mic_ptr)(OM_uint32 *, gss_ctx_id_t,
gss_qop_t, gss_buffer_t, gss_qop_t, gss_buffer_t,
gss_buffer_t); gss_buffer_t);
typedef void (KRB5_CALLCONV *krb5_free_context_ptr)(krb5_context); typedef void KRB5_CALLCONV (*krb5_free_context_ptr)(krb5_context);
typedef void (KRB5_CALLCONV *krb5_free_principal_ptr)(krb5_context, typedef void KRB5_CALLCONV (*krb5_free_principal_ptr)(krb5_context,
krb5_principal); krb5_principal);
typedef krb5_error_code (KRB5_CALLCONV *krb5_cc_destroy_ptr)(krb5_context, typedef krb5_error_code KRB5_CALLCONV (*krb5_cc_destroy_ptr)(krb5_context,
krb5_ccache); krb5_ccache);
#endif #endif