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
/
wrap_iov.c
diff --git
a/mech_eap/wrap_iov.c
b/mech_eap/wrap_iov.c
index
31450fc
..
4d5701f
100644
(file)
--- a/
mech_eap/wrap_iov.c
+++ b/
mech_eap/wrap_iov.c
@@
-60,7
+60,7
@@
#include "gssapiP_eap.h"
unsigned char
#include "gssapiP_eap.h"
unsigned char
-rfc4121Flags(gss_ctx_id_t ctx, int receiving)
+rfc4121Flags(gss_c
onst_c
tx_id_t ctx, int receiving)
{
unsigned char flags;
int isAcceptor;
{
unsigned char flags;
int isAcceptor;
@@
-126,7
+126,7
@@
gssEapWrapOrGetMIC(OM_uint32 *minor,
gssEapIovMessageLength(iov, iov_count, &dataLen, &assocDataLen);
gssEapIovMessageLength(iov, iov_count, &dataLen, &assocDataLen);
- header = gssEapLocate
Iov(iov, iov_count, GSS_IOV_BUFFER_TYPE_HEADER
);
+ header = gssEapLocate
HeaderIov(iov, iov_count, toktype
);
if (header == NULL) {
*minor = GSSEAP_MISSING_IOV;
return GSS_S_FAILURE;
if (header == NULL) {
*minor = GSSEAP_MISSING_IOV;
return GSS_S_FAILURE;
@@
-248,7
+248,7
@@
gssEapWrapOrGetMIC(OM_uint32 *minor,
if (code != 0)
goto cleanup;
if (code != 0)
goto cleanup;
-
assert
(gssTrailerLen <= 0xFFFF);
+
GSSEAP_ASSERT
(gssTrailerLen <= 0xFFFF);
if (trailer == NULL) {
rrc = gssTrailerLen;
if (trailer == NULL) {
rrc = gssTrailerLen;
@@
-297,7
+297,7
@@
gssEapWrapOrGetMIC(OM_uint32 *minor,
code = gssEapSign(krbContext, ctx->checksumType, rrc,
KRB_CRYPTO_CONTEXT(ctx), keyUsage,
code = gssEapSign(krbContext, ctx->checksumType, rrc,
KRB_CRYPTO_CONTEXT(ctx), keyUsage,
- iov, iov_count);
+ iov, iov_count
, toktype
);
if (code != 0)
goto cleanup;
if (code != 0)
goto cleanup;
@@
-336,7
+336,7
@@
cleanup:
return (code == 0) ? GSS_S_COMPLETE : GSS_S_FAILURE;
}
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,
gss_wrap_iov(OM_uint32 *minor,
gss_ctx_id_t ctx,
int conf_req_flag,
@@
-359,7
+359,7
@@
gss_wrap_iov(OM_uint32 *minor,
*minor = 0;
*minor = 0;
- GSSEAP_MUTEX_LOCK(&
ctx
->mutex);
+ GSSEAP_MUTEX_LOCK(&
((gss_ctx_id_t)ctx)
->mutex);
if (!CTX_IS_ESTABLISHED(ctx)) {
major = GSS_S_NO_CONTEXT;
if (!CTX_IS_ESTABLISHED(ctx)) {
major = GSS_S_NO_CONTEXT;
@@
-367,13
+367,14
@@
gss_wrap_iov(OM_uint32 *minor,
goto cleanup;
}
goto cleanup;
}
- major = gssEapWrapOrGetMIC(minor, ctx, conf_req_flag, conf_state,
+ major = gssEapWrapOrGetMIC(minor,
(gss_ctx_id_t)
ctx, conf_req_flag, conf_state,
iov, iov_count, TOK_TYPE_WRAP);
if (GSS_ERROR(major))
goto cleanup;
cleanup:
iov, iov_count, TOK_TYPE_WRAP);
if (GSS_ERROR(major))
goto cleanup;
cleanup:
- GSSEAP_MUTEX_UNLOCK(&
ctx
->mutex);
+ GSSEAP_MUTEX_UNLOCK(&
((gss_ctx_id_t)ctx)
->mutex);
return major;
}
return major;
}
+