comment out dumping code

[mech_eap.orig] / unwrap.c

diff --git a/unwrap.c b/unwrap.c
index 64acb13..ae35bf9 100644 (file)
--- a/unwrap.c
+++ b/unwrap.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,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Message protection services: unwrap.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32
@@ -43,6 +47,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_CALL_INACCESSIBLE_READ | 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;
 
@@ -50,7 +69,8 @@ gss_unwrap(OM_uint32 *minor,
     iov[1].buffer.value = NULL;
     iov[1].buffer.length = 0;
 
-    major = gss_unwrap_iov(minor, ctx, conf_state, qop_state, iov, 2);
+    major = gssEapUnwrapOrVerifyMIC(minor, ctx, conf_state, qop_state,
+                                    iov, 2, TOK_TYPE_WRAP);
     if (major == GSS_S_COMPLETE) {
         *output_message_buffer = iov[1].buffer;
     } else {
@@ -58,5 +78,8 @@ gss_unwrap(OM_uint32 *minor,
             gss_release_buffer(&tmpMinor, &iov[1].buffer);
     }
 
+cleanup:
+    GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+
     return major;
 }