Resolve minor conflict in merge.

[mech_eap.git] / mech_eap / wrap_iov.c

diff --git a/mech_eap/wrap_iov.c b/mech_eap/wrap_iov.c
index be890b6..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
-rfc4121Flags(gss_ctx_id_t ctx, int receiving)
+rfc4121Flags(gss_const_ctx_id_t ctx, int receiving)
 {
     unsigned char flags;
     int isAcceptor;
@@ -126,7 +126,7 @@ gssEapWrapOrGetMIC(OM_uint32 *minor,
 
     gssEapIovMessageLength(iov, iov_count, &dataLen, &assocDataLen);
 
-    header = gssEapLocateIov(iov, iov_count, GSS_IOV_BUFFER_TYPE_HEADER);
+    header = gssEapLocateHeaderIov(iov, iov_count, toktype);
     if (header == NULL) {
         *minor = GSSEAP_MISSING_IOV;
         return GSS_S_FAILURE;
@@ -297,7 +297,7 @@ gssEapWrapOrGetMIC(OM_uint32 *minor,
 
         code = gssEapSign(krbContext, ctx->checksumType, rrc,
                           KRB_CRYPTO_CONTEXT(ctx), keyUsage,
-                          iov, iov_count);
+                          iov, iov_count, toktype);
         if (code != 0)
             goto cleanup;
 
@@ -359,7 +359,7 @@ gss_wrap_iov(OM_uint32 *minor,
 
     *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;
@@ -367,13 +367,14 @@ gss_wrap_iov(OM_uint32 *minor,
         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:
-    GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+    GSSEAP_MUTEX_UNLOCK(&((gss_ctx_id_t)ctx)->mutex);
 
     return major;
 }
+