remove debugging statement

[moonshot.git] / mech_eap / get_mic.c

diff --git a/mech_eap/get_mic.c b/mech_eap/get_mic.c
index 9dde401..c19e68f 100644 (file)
--- a/mech_eap/get_mic.c
+++ b/mech_eap/get_mic.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,22 +30,33 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Message protection services: make a message integerity check.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32
 gss_get_mic(OM_uint32 *minor,
             gss_ctx_id_t ctx,
-            gss_qop_t qop_req __attribute__((__unused__)),
+            gss_qop_t qop_req,
             gss_buffer_t message_buffer,
             gss_buffer_t message_token)
 {
     OM_uint32 major;
     gss_iov_buffer_desc iov[2];
 
-    *minor = 0;
+    if (ctx == GSS_C_NO_CONTEXT) {
+        *minor = EINVAL;
+        return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_NO_CONTEXT;
+    }
 
-    if (ctx == GSS_C_NO_CONTEXT)
-        return GSS_S_NO_CONTEXT;
+    if (qop_req != GSS_C_QOP_DEFAULT) {
+        *minor = GSSEAP_UNKNOWN_QOP;
+        return GSS_S_UNAVAILABLE;
+    }
+
+    *minor = 0;
 
     message_token->value = NULL;
     message_token->length = 0;
@@ -54,6 +65,7 @@ gss_get_mic(OM_uint32 *minor,
 
     if (!CTX_IS_ESTABLISHED(ctx)) {
         major = GSS_S_NO_CONTEXT;
+        *minor = GSSEAP_CONTEXT_INCOMPLETE;
         goto cleanup;
     }
 
@@ -65,9 +77,10 @@ gss_get_mic(OM_uint32 *minor,
     iov[1].buffer.length = 0;
 
     major = gssEapWrapOrGetMIC(minor, ctx, FALSE, NULL, iov, 2, TOK_TYPE_MIC);
-    if (major == GSS_S_COMPLETE) {
-        *message_token = iov[1].buffer;
-    }
+    if (GSS_ERROR(major))
+        goto cleanup;
+
+    *message_token = iov[1].buffer;
 
 cleanup:
     GSSEAP_MUTEX_UNLOCK(&ctx->mutex);