call gssEapCanonicalizeOid, gssEapInternalizeOid is no longer public

[mech_eap.orig] / context_time.c

diff --git a/context_time.c b/context_time.c
index ee330f1..1486065 100644 (file)
--- a/context_time.c
+++ b/context_time.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,36 +30,40 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Determine remaining lifetime of a context handle.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32
 gss_context_time(OM_uint32 *minor,
-                 gss_ctx_id_t context_handle,
+                 gss_ctx_id_t ctx,
                  OM_uint32 *time_rec)
 {
-    if (context_handle == GSS_C_NO_CONTEXT) {
-        return GSS_S_NO_CONTEXT;
-    }
+    OM_uint32 major;
 
-    if (!CTX_IS_ESTABLISHED(context_handle)) {
-        return GSS_S_NO_CONTEXT;
+    if (ctx == GSS_C_NO_CONTEXT) {
+        *minor = EINVAL;
+        return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_NO_CONTEXT;
     }
 
     *minor = 0;
 
-    if (context_handle->expiryTime == 0) {
-        *time_rec = GSS_C_INDEFINITE;
-    } else {
-        time_t now, lifetime;
+    GSSEAP_MUTEX_LOCK(&ctx->mutex);
 
-        time(&now);
-        lifetime = context_handle->expiryTime - now;
-        if (lifetime <= 0) {
-            *time_rec = 0;
-            return GSS_S_CONTEXT_EXPIRED;
-        }
-        *time_rec = lifetime;
+    if (!CTX_IS_ESTABLISHED(ctx)) {
+        *minor = GSSEAP_CONTEXT_INCOMPLETE;
+        major = GSS_S_NO_CONTEXT;
+        goto cleanup;
     }
 
-    return GSS_S_COMPLETE;
+    major = gssEapContextTime(minor, ctx, time_rec);
+    if (GSS_ERROR(major))
+        goto cleanup;
+
+cleanup:
+    GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+
+    return major;
 }