projects / mech_eap.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cbc6ccd 0a1171f)
Merge remote-tracking branch 'origin/eap-tls'
authorSam Hartman <hartmans@debian.org>
Fri, 20 Sep 2013 17:04:12 +0000 (13:04 -0400)
committerSam Hartman <hartmans@debian.org>
Fri, 20 Sep 2013 17:04:12 +0000 (13:04 -0400)
commit26311844916784cc0781b1a304b590dff5742fcb
treec47340cdac434f6d101f8ab6b62b08f1c9f8955dtree | snapshot
parentcbc6ccd195f6f7e412733cbd6ff4c1b9d07662d1commit | diff
parent0a1171f9f4a213ba20c740c4ba2fac7a8ff423b4commit | diff
Merge remote-tracking branch 'origin/eap-tls'

The eap-tls branch includes build dependencies on openssl which we
need for the sha2 hash support in IDP certs.  The eap-tls changes are
not widely exposed, but to the extent they are present are harmless.

Conflicts:
libeap/Makefile.am
mech_eap/Makefile.am
mech_eap/gssapiP_eap.h
mech_eap/init_sec_context.c
acinclude.m4 diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
libeap/Makefile.am diff1 | diff2 | blob | history
mech_eap/Makefile.am diff1 | diff2 | blob | history
mech_eap/gssapiP_eap.h 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_cred.c diff1 | diff2 | blob | history
Moonshot GSS-API mechanism