projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for Heimdal (macOS) builds from Stefan.
[mech_eap.git]
/
mech_eap
/
process_context_token.c
diff --git
a/mech_eap/process_context_token.c
b/mech_eap/process_context_token.c
index
5bad3c0
..
a6f8838
100644
(file)
--- a/
mech_eap/process_context_token.c
+++ b/
mech_eap/process_context_token.c
@@
-32,9
+32,13
@@
#include "gssapiP_eap.h"
#include "gssapiP_eap.h"
-OM_uint32
+OM_uint32
GSSAPI_CALLCONV
gss_process_context_token(OM_uint32 *minor,
gss_process_context_token(OM_uint32 *minor,
+#ifdef HAVE_HEIMDAL_VERSION
+ gss_const_ctx_id_t ctx,
+#else
gss_ctx_id_t ctx,
gss_ctx_id_t ctx,
+#endif
gss_buffer_t token_buffer)
{
OM_uint32 major;
gss_buffer_t token_buffer)
{
OM_uint32 major;
@@
-47,10
+51,10
@@
gss_process_context_token(OM_uint32 *minor,
return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_NO_CONTEXT;
}
return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_NO_CONTEXT;
}
- GSSEAP_MUTEX_LOCK(&
ctx
->mutex);
+ GSSEAP_MUTEX_LOCK(&
((gss_ctx_id_t)ctx)
->mutex);
if (!CTX_IS_ESTABLISHED(ctx)) {
if (!CTX_IS_ESTABLISHED(ctx)) {
- GSSEAP_MUTEX_UNLOCK(&
ctx
->mutex);
+ GSSEAP_MUTEX_UNLOCK(&
((gss_ctx_id_t)ctx)
->mutex);
*minor = GSSEAP_CONTEXT_INCOMPLETE;
return GSS_S_NO_CONTEXT;
}
*minor = GSSEAP_CONTEXT_INCOMPLETE;
return GSS_S_NO_CONTEXT;
}
@@
-58,14
+62,14
@@
gss_process_context_token(OM_uint32 *minor,
iov[0].type = GSS_IOV_BUFFER_TYPE_HEADER;
iov[0].buffer = *token_buffer;
iov[0].type = GSS_IOV_BUFFER_TYPE_HEADER;
iov[0].buffer = *token_buffer;
- major = gssEapUnwrapOrVerifyMIC(minor, ctx, NULL, NULL,
+ major = gssEapUnwrapOrVerifyMIC(minor,
(gss_ctx_id_t)
ctx, NULL, NULL,
iov, 1, TOK_TYPE_DELETE_CONTEXT);
if (GSS_ERROR(major)) {
iov, 1, TOK_TYPE_DELETE_CONTEXT);
if (GSS_ERROR(major)) {
- GSSEAP_MUTEX_UNLOCK(&
ctx
->mutex);
+ GSSEAP_MUTEX_UNLOCK(&
((gss_ctx_id_t)ctx)
->mutex);
return major;
}
return major;
}
- GSSEAP_MUTEX_UNLOCK(&
ctx
->mutex);
+ GSSEAP_MUTEX_UNLOCK(&
((gss_ctx_id_t)ctx)
->mutex);
- return gssEapReleaseContext(minor, &ctx);
+ return gssEapReleaseContext(minor,
(gss_ctx_id_t *)
&ctx);
}
}