cleanup unused parameter warnings

[mech_eap.orig] / inquire_sec_context_by_oid.c

diff --git a/inquire_sec_context_by_oid.c b/inquire_sec_context_by_oid.c
index 93ea808..a69b9e9 100644 (file)
--- a/inquire_sec_context_by_oid.c
+++ b/inquire_sec_context_by_oid.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,12 +30,16 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Return extended properties of a context handle.
+ */
+
 #include "gssapiP_eap.h"
 
 static OM_uint32
 inquireSessionKey(OM_uint32 *minor,
                   const gss_ctx_id_t ctx,
-                  const gss_OID desired_object,
+                  const gss_OID desired_object GSSEAP_UNUSED,
                   gss_buffer_set_t *dataSet)
 {
     OM_uint32 major, tmpMinor;
@@ -69,6 +73,7 @@ inquireSessionKey(OM_uint32 *minor,
         goto cleanup;
 
     major = GSS_S_COMPLETE;
+    *minor = 0;
 
 cleanup:
     if (GSS_ERROR(major) && *dataSet != GSS_C_NO_BUFFER_SET) {
@@ -92,26 +97,45 @@ static struct {
         { 11, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05" },
         inquireSessionKey
     },
+    {
+        /* GSS_KRB5_EXPORT_LUCID_SEC_CONTEXT + v1 */
+        { 12, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x06\x01" },
+        gssEapExportLucidSecContext
+    },
 };
 
 OM_uint32
 gss_inquire_sec_context_by_oid(OM_uint32 *minor,
-                               const gss_ctx_id_t context_handle,
+                               const gss_ctx_id_t ctx,
                                const gss_OID desired_object,
                                gss_buffer_set_t *data_set)
 {
-    OM_uint32 major = GSS_S_UNAVAILABLE;
+    OM_uint32 major;
     int i;
 
     *data_set = GSS_C_NO_BUFFER_SET;
 
+    GSSEAP_MUTEX_LOCK(&ctx->mutex);
+
+    if (!CTX_IS_ESTABLISHED(ctx)) {
+        *minor = GSSEAP_CONTEXT_INCOMPLETE;
+        major = GSS_S_NO_CONTEXT;
+        goto cleanup;
+    }
+
+    major = GSS_S_UNAVAILABLE;
+    *minor = GSSEAP_BAD_CONTEXT_OPTION;
+
     for (i = 0; i < sizeof(inquireCtxOps) / sizeof(inquireCtxOps[0]); i++) {
         if (oidEqual(&inquireCtxOps[i].oid, desired_object)) {
-            major = (*inquireCtxOps[i].inquire)(minor, context_handle,
+            major = (*inquireCtxOps[i].inquire)(minor, ctx,
                                                  desired_object, data_set);
             break;
         }
     }
 
+cleanup:
+    GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+
     return major;
 }