projects
/
mech_eap.orig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use GSSAPI_CALLCONV for exported SPIs
[mech_eap.orig]
/
mech_eap
/
unwrap_iov.c
diff --git
a/mech_eap/unwrap_iov.c
b/mech_eap/unwrap_iov.c
index
19bafc6
..
9e3ef19
100644
(file)
--- a/
mech_eap/unwrap_iov.c
+++ b/
mech_eap/unwrap_iov.c
@@
-319,7
+319,7
@@
unwrapStream(OM_uint32 *minor,
unsigned char *ptr;
OM_uint32 code = 0, major = GSS_S_FAILURE;
krb5_context krbContext;
unsigned char *ptr;
OM_uint32 code = 0, major = GSS_S_FAILURE;
krb5_context krbContext;
- int conf_req_flag
, toktype2
;
+ int conf_req_flag;
int i = 0, j;
gss_iov_buffer_desc *tiov = NULL;
gss_iov_buffer_t stream, data = NULL;
int i = 0, j;
gss_iov_buffer_desc *tiov = NULL;
gss_iov_buffer_t stream, data = NULL;
@@
-346,8
+346,7
@@
unwrapStream(OM_uint32 *minor,
}
ptr = (unsigned char *)stream->buffer.value;
}
ptr = (unsigned char *)stream->buffer.value;
- toktype2 = load_uint16_be(ptr);
- ptr += 2;
+ ptr += 2; /* skip token type */
tiov = (gss_iov_buffer_desc *)GSSEAP_CALLOC((size_t)iov_count + 2,
sizeof(gss_iov_buffer_desc));
tiov = (gss_iov_buffer_desc *)GSSEAP_CALLOC((size_t)iov_count + 2,
sizeof(gss_iov_buffer_desc));
@@
-529,7
+528,7
@@
gssEapUnwrapOrVerifyMIC(OM_uint32 *minor,
return major;
}
return major;
}
-OM_uint32
+OM_uint32
GSSAPI_CALLCONV
gss_unwrap_iov(OM_uint32 *minor,
gss_ctx_id_t ctx,
int *conf_state,
gss_unwrap_iov(OM_uint32 *minor,
gss_ctx_id_t ctx,
int *conf_state,