remove util_alloc.c

[mech_eap.orig] / unwrap_iov.c

diff --git a/unwrap_iov.c b/unwrap_iov.c
index 7e6eb87..705cbc1 100644 (file)
--- a/unwrap_iov.c
+++ b/unwrap_iov.c
@@ -398,7 +398,6 @@ unwrapStream(OM_uint32 *minor,
     }
 
     /* IOV: -----------0-------------+---1---+--2--+----------------3--------------*/
-    /* Old: GSS-Header | Conf        | Data  | Pad |                               */
     /* CFX: GSS-Header | Kerb-Header | Data  |     | EC | E(Header) | Kerb-Trailer */
     /* GSS: -------GSS-HEADER--------+-DATA--+-PAD-+----------GSS-TRAILER----------*/
 
@@ -485,9 +484,23 @@ gss_unwrap_iov(OM_uint32 *minor,
                gss_iov_buffer_desc *iov,
                int iov_count)
 {
-    if (!CTX_IS_ESTABLISHED(ctx))
+    OM_uint32 major = GSS_S_NO_CONTEXT;
+
+    if (ctx == GSS_C_NO_CONTEXT) {
+        *minor = EINVAL;
         return GSS_S_NO_CONTEXT;
+    }
+
+    *minor = 0;
+
+    GSSEAP_MUTEX_LOCK(&ctx->mutex);
 
-    return gssEapUnwrapOrVerifyMIC(minor, ctx, conf_state, qop_state,
-                                   iov, iov_count, TOK_TYPE_WRAP);
+    if (CTX_IS_ESTABLISHED(ctx)) {
+        major = gssEapUnwrapOrVerifyMIC(minor, ctx, conf_state, qop_state,
+                                        iov, iov_count, TOK_TYPE_WRAP);
+    }
+
+    GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+
+    return major;
 }