Merged the hostap_2.6 updates, and the Leap of Faith work, from the hostap_update...
authorDan Breslau <dbreslau@painless-security.com>
Tue, 25 Oct 2016 20:30:32 +0000 (16:30 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Tue, 25 Oct 2016 20:30:32 +0000 (16:30 -0400)
1  2 
libeap/src/eap_peer/eap_ttls.c
mech_eap/gssapiP_eap.h
mech_eap/init_sec_context.c
mech_eap/util.h

Simple merge
Simple merge
@@@ -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;
  }
diff --cc mech_eap/util.h
Simple merge