various mutex-related cleanups

[mech_eap.git] / unwrap_iov.c

diff --git a/unwrap_iov.c b/unwrap_iov.c
index 7e6eb87..e096d68 100644 (file)
--- a/unwrap_iov.c
+++ b/unwrap_iov.c
@@ -485,9 +485,22 @@ gss_unwrap_iov(OM_uint32 *minor,
                gss_iov_buffer_desc *iov,
                int iov_count)
 {
-    if (!CTX_IS_ESTABLISHED(ctx))
+    OM_uint32 major;
+
+    if (ctx == GSS_C_NO_CONTEXT)
         return GSS_S_NO_CONTEXT;
 
-    return gssEapUnwrapOrVerifyMIC(minor, ctx, conf_state, qop_state,
-                                   iov, iov_count, TOK_TYPE_WRAP);
+    GSSEAP_MUTEX_LOCK(&ctx->mutex);
+
+    if (!CTX_IS_ESTABLISHED(ctx)) {
+        *minor = 0;
+        major = GSS_S_NO_CONTEXT;
+    } else {
+        major = gssEapUnwrapOrVerifyMIC(minor, ctx, conf_state, qop_state,
+                                        iov, iov_count, TOK_TYPE_WRAP);
+    }
+
+    GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+
+    return major;
 }