From: Dan Breslau <dbreslau@painless-security.com>
Date: Tue, 25 Oct 2016 20:30:32 +0000 (-0400)
Subject: Merged the hostap_2.6 updates, and the Leap of Faith work, from the hostap_update... 
X-Git-Tag: v0.9.6~2
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=f3746d009c6d7f50025af1f58a85e5fee9680be6

Merged the hostap_2.6 updates, and the Leap of Faith work, from the hostap_update branch
---

f3746d009c6d7f50025af1f58a85e5fee9680be6
diff --cc mech_eap/init_sec_context.c
index 9c62f5a,0181a4f..37bd3d0
--- a/mech_eap/init_sec_context.c
+++ b/mech_eap/init_sec_context.c
@@@ -1370,7 -1458,7 +1466,8 @@@ gss_init_sec_context(OM_uint32 *minor
      if (GSS_ERROR(major))
          gssEapReleaseContext(&tmpMinor, context_handle);
  
 -    gssEapTraceStatus( "gss_init_sec_context", major, *minor);
 +    gssEapTraceStatus("gss_init_sec_context", major, *minor);
 +
      return major;
  }
+