fix some build errors

[mech_eap.git] / unwrap_iov.c

diff --git a/unwrap_iov.c b/unwrap_iov.c
index 4061bee..6ed4caf 100644 (file)
--- a/unwrap_iov.c
+++ b/unwrap_iov.c
@@ -228,8 +228,8 @@ unwrapToken(OM_uint32 *minor,
             return GSS_S_BAD_SIG;
         }
         code = sequenceCheck(&ctx->seqState, seqnum);
-    } else if (toktype == TOK_TYPE_DELETE) {
-        if (load_uint16_be(ptr) != TOK_TYPE_DELETE)
+    } else if (toktype == TOK_TYPE_DELETE_CONTEXT) {
+        if (load_uint16_be(ptr) != TOK_TYPE_DELETE_CONTEXT)
             goto defective;
         goto verify_mic_1;
     } else {
@@ -471,6 +471,9 @@ gssEapUnwrapOrVerifyMIC(OM_uint32 *minor,
     if (!CTX_IS_ESTABLISHED(ctx))
         return GSS_S_NO_CONTEXT;
 
+    if (ctx->encryptionType == ENCTYPE_NULL)
+        return GSS_S_UNAVAILABLE;
+
     if (gssEapLocateIov(iov, iov_count, GSS_IOV_BUFFER_TYPE_STREAM) != NULL) {
         major = unwrapStream(minor, ctx, conf_state, qop_state,
                              iov, iov_count, toktype);