X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=mech_eap%2Funwrap_iov.c;h=9e3ef195e599fa9315c6452cbc08f3ad670be315;hb=9c9f46eeed8ecbd816732d49d3f6ba9a5649fe71;hp=19bafc6bbd8c3a5b7c715a36e8fa8569e4ffd7c8;hpb=acc2e49c1b52930eb717443fee098d4e7773bd5a;p=mech_eap.orig diff --git a/mech_eap/unwrap_iov.c b/mech_eap/unwrap_iov.c index 19bafc6..9e3ef19 100644 --- 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; - 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; @@ -346,8 +346,7 @@ unwrapStream(OM_uint32 *minor, } 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)); @@ -529,7 +528,7 @@ gssEapUnwrapOrVerifyMIC(OM_uint32 *minor, return major; } -OM_uint32 +OM_uint32 GSSAPI_CALLCONV gss_unwrap_iov(OM_uint32 *minor, gss_ctx_id_t ctx, int *conf_state,