Allow zero length but non-NULL tokens on init_sec_context

[mech_eap.orig] / inquire_cred.c

diff --git a/inquire_cred.c b/inquire_cred.c
index 3e0654b..01c3b4a 100644 (file)
--- a/inquire_cred.c
+++ b/inquire_cred.c
@@ -30,5 +30,80 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Return credential handle properties.
+ */
+
 #include "gssapiP_eap.h"
 
+OM_uint32
+gss_inquire_cred(OM_uint32 *minor,
+                 gss_cred_id_t cred,
+                 gss_name_t *name,
+                 OM_uint32 *pLifetime,
+                 gss_cred_usage_t *cred_usage,
+                 gss_OID_set *mechanisms)
+{
+    OM_uint32 major;
+
+    if (cred == NULL) {
+        *minor = EINVAL;
+        return GSS_S_NO_CRED;
+    }
+
+    GSSEAP_MUTEX_LOCK(&cred->mutex);
+
+    if (name != NULL) {
+        major = gssEapDuplicateName(minor, cred->name, name);
+        if (GSS_ERROR(major))
+            goto cleanup;
+    }
+
+    if (pLifetime != NULL) {
+        time_t now, lifetime;
+
+        if (cred->expiryTime == 0) {
+            lifetime = GSS_C_INDEFINITE;
+        } else  {
+            now = time(NULL);
+            lifetime = now - cred->expiryTime;
+            if (lifetime < 0)
+                lifetime = 0;
+        }
+
+        *pLifetime = lifetime;
+    }
+
+    if (cred_usage != NULL) {
+        OM_uint32 flags = (cred->flags & (CRED_FLAG_INITIATE | CRED_FLAG_ACCEPT));
+
+        switch (flags) {
+        case CRED_FLAG_INITIATE:
+            *cred_usage = GSS_C_INITIATE;
+            break;
+        case CRED_FLAG_ACCEPT:
+            *cred_usage = GSS_C_ACCEPT;
+            break;
+        default:
+            *cred_usage = GSS_C_BOTH;
+            break;
+        }
+    }
+
+    if (mechanisms != NULL) {
+        if (cred->mechanisms != GSS_C_NO_OID_SET)
+            major = duplicateOidSet(minor, cred->mechanisms, mechanisms);
+        else
+            major = gssEapIndicateMechs(minor, mechanisms);
+        if (GSS_ERROR(major))
+            goto cleanup;
+    }
+
+    major = GSS_S_COMPLETE;
+    *minor = 0;
+
+cleanup:
+    GSSEAP_MUTEX_UNLOCK(&cred->mutex);
+
+    return major;
+}