Better error reporting through com_err
[mech_eap.orig] / unwrap.c
index ca10b32..911fd2b 100644 (file)
--- a/unwrap.c
+++ b/unwrap.c
@@ -43,6 +43,21 @@ gss_unwrap(OM_uint32 *minor,
     OM_uint32 major, tmpMinor;
     gss_iov_buffer_desc iov[2];
 
+    if (ctx == GSS_C_NO_CONTEXT) {
+        *minor = EINVAL;
+        return GSS_S_NO_CONTEXT;
+    }
+
+    *minor = 0;
+
+    GSSEAP_MUTEX_LOCK(&ctx->mutex);
+
+    if (!CTX_IS_ESTABLISHED(ctx)) {
+        major = GSS_S_NO_CONTEXT;
+        *minor = GSSEAP_CONTEXT_INCOMPLETE;
+        goto cleanup;
+    }
+
     iov[0].type = GSS_IOV_BUFFER_TYPE_STREAM;
     iov[0].buffer = *input_message_buffer;
 
@@ -59,5 +74,8 @@ gss_unwrap(OM_uint32 *minor,
             gss_release_buffer(&tmpMinor, &iov[1].buffer);
     }
 
+cleanup:
+    GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+
     return major;
 }