From: Luke Howard <lukeh@padl.com>
Date: Wed, 9 Mar 2011 14:22:09 +0000 (+1100)
Subject: add some more assertion checks
X-Git-Tag: vm/20110310~12
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=f48009d662f5f47c58cedbc3093efa145946ed85

add some more assertion checks
---

diff --git a/mech_eap/util_sm.c b/mech_eap/util_sm.c
index ae687ba..339d397 100644
--- a/mech_eap/util_sm.c
+++ b/mech_eap/util_sm.c
@@ -382,7 +382,7 @@ gssEapSmStep(OM_uint32 *minor,
     /* Format output token from inner tokens */
     if (innerOutputTokens->count != 0 ||            /* inner tokens to send */
         !CTX_IS_INITIATOR(ctx) ||                   /* any leg acceptor */
-        ctx->state != GSSEAP_STATE_ESTABLISHED) {   /* non-last leg initiator */
+        !CTX_IS_ESTABLISHED(ctx)) {                 /* non-last leg initiator */
         tmpMajor = gssEapEncodeInnerTokens(&tmpMinor, innerOutputTokens,
                                            outputTokenTypes, &unwrappedOutputToken);
         if (tmpMajor == GSS_S_COMPLETE) {
@@ -396,6 +396,9 @@ gssEapSmStep(OM_uint32 *minor,
         }
     }
 
+    /* If the context is established, empty tokens only to be emitted by initiator */
+    assert(!CTX_IS_ESTABLISHED(ctx) || ((outputToken->length == 0) == CTX_IS_INITIATOR(ctx)));
+
     SM_ASSERT_VALID(ctx, major);
 
 cleanup: