www.project-moonshot.org Git - mech_eap.git/commit - mech_eap/util.h

projects / mech_eap.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7c47f43 3487bc0)

author	Sam Hartman <hartmans@debian.org>
	Fri, 13 Sep 2013 19:41:19 +0000 (15:41 -0400)
committer	Sam Hartman <hartmans@debian.org>
	Fri, 13 Sep 2013 19:41:19 +0000 (15:41 -0400)
commit	d81b9e4605c7bd3da62f3679effe124778592b13
tree	71b910f178c62356d7968da70a2774942ee10614	tree \| snapshot
parent	7c47f43737f6b5f8509cfbe7f95d7171272cfd08	commit \| diff
parent	3487bc06af5c985ac9a059f06b1e1402345bb6bb	commit \| diff

EAP Channel binding support

Merge remote-tracking branch 'origin/eap-chbind'

Conflicts:
mech_eap/accept_sec_context.c
mech_eap/dictionary.ukerna
mech_eap/gsseap_err.et
mech_eap/util_radius.h

libeap/src/utils/common.h	diff1 \|	diff2 \|	blob \| history
mech_eap/accept_sec_context.c	diff1 \|	diff2 \|	blob \| history
mech_eap/dictionary.ukerna	diff1 \|	diff2 \|	blob \| history
mech_eap/gssapiP_eap.h	diff1 \|	diff2 \|	blob \| history
mech_eap/gsseap_err.et	diff1 \|	diff2 \|	blob \| history
mech_eap/init_sec_context.c	diff1 \|	diff2 \|	blob \| history
mech_eap/util.h	diff1 \|	diff2 \|	blob \| history
mech_eap/util_radius.cpp	diff1 \|	diff2 \|	blob \| history
mech_eap/util_radius.h	diff1 \|	diff2 \|	blob \| history

Moonshot GSS-API mechanism