From: Luke Howard Date: Wed, 27 Apr 2011 15:13:13 +0000 (+0200) Subject: fix mech_eap build on OS X X-Git-Tag: 0.9.2~207 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=32c7cb5841cb87eb434b1a802f0032b2b71c7d17 fix mech_eap build on OS X --- 32c7cb5841cb87eb434b1a802f0032b2b71c7d17 diff --cc libeap/Makefile.am index a87ee2e,0000000..2ba9a7b mode 100644,000000..100644 --- a/libeap/Makefile.am +++ b/libeap/Makefile.am @@@ -1,124 -1,0 +1,126 @@@ +AUTOMAKE_OPTIONS = foreign + +AM_CPPFLAGS = -I$(srcdir)/src -I$(srcdir)/eap_example -I$(srcdir)/src/utils + +SOURCES_BOTH = src/eap_common/eap_peap_common.c +SOURCES_BOTH += src/eap_common/eap_psk_common.c +SOURCES_BOTH += src/eap_common/eap_pax_common.c +SOURCES_BOTH += src/eap_common/eap_sake_common.c +SOURCES_BOTH += src/eap_common/eap_gpsk_common.c +SOURCES_BOTH += src/eap_common/chap.c + +SOURCES_peer = src/eap_peer/eap_tls.c +SOURCES_peer += src/eap_peer/eap_peap.c +SOURCES_peer += src/eap_peer/eap_ttls.c +SOURCES_peer += src/eap_peer/eap_md5.c +SOURCES_peer += src/eap_peer/eap_mschapv2.c +SOURCES_peer += src/eap_peer/mschapv2.c +SOURCES_peer += src/eap_peer/eap_otp.c +SOURCES_peer += src/eap_peer/eap_gtc.c +SOURCES_peer += src/eap_peer/eap_leap.c +SOURCES_peer += src/eap_peer/eap_psk.c +SOURCES_peer += src/eap_peer/eap_pax.c +SOURCES_peer += src/eap_peer/eap_sake.c +SOURCES_peer += src/eap_peer/eap_gpsk.c +SOURCES_peer += src/eap_peer/eap.c +SOURCES_peer += src/eap_common/eap_common.c +SOURCES_peer += src/eap_peer/eap_methods.c +SOURCES_peer += src/eap_peer/eap_tls_common.c +CFLAGS += -DEAP_TLS +CFLAGS += -DEAP_PEAP +CFLAGS += -DEAP_TTLS +CFLAGS += -DEAP_MD5 +CFLAGS += -DEAP_MSCHAPv2 +CFLAGS += -DEAP_GTC +CFLAGS += -DEAP_OTP +CFLAGS += -DEAP_LEAP +CFLAGS += -DEAP_PSK +CFLAGS += -DEAP_PAX +CFLAGS += -DEAP_SAKE +CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256 + +CFLAGS += -DEAP_SERVER_IDENTITY +CFLAGS += -DEAP_SERVER_TLS +CFLAGS += -DEAP_SERVER_PEAP +CFLAGS += -DEAP_SERVER_TTLS +CFLAGS += -DEAP_SERVER_MD5 +CFLAGS += -DEAP_SERVER_MSCHAPV2 +CFLAGS += -DEAP_SERVER_GTC +CFLAGS += -DEAP_SERVER_PSK +CFLAGS += -DEAP_SERVER_PAX +CFLAGS += -DEAP_SERVER_SAKE +CFLAGS += -DEAP_SERVER_GPSK -DEAP_SERVER_GPSK_SHA256 + +CFLAGS += -DIEEE8021X_EAPOL +CFLAGS += -DCONFIG_IPV6 + +CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH +CFLAGS += -DCONFIG_CRYPTO_INTERNAL + + +UTILS_SRCS = src/utils/base64.c \ + src/utils/common.c \ + src/utils/ip_addr.c \ + src/utils/radiotap.c \ + src/utils/trace.c \ + src/utils/uuid.c \ - src/utils/wpa_debug.c \ - src/utils/wpabuf.c ++ src/utils/wpa_debug.c \ ++ src/utils/wpabuf.c \ ++ src/utils/os_unix.c ++ +CRYPTO_SRCS = \ + src/crypto/aes-cbc.c \ + src/crypto/aes-ctr.c \ + src/crypto/aes-eax.c \ + src/crypto/aes-encblock.c \ + src/crypto/aes-internal.c \ + src/crypto/aes-internal-dec.c \ + src/crypto/aes-internal-enc.c \ + src/crypto/aes-omac1.c \ + src/crypto/aes-unwrap.c \ + src/crypto/aes-wrap.c \ + src/crypto/des-internal.c \ + src/crypto/dh_group5.c \ + src/crypto/dh_groups.c \ + src/crypto/md4-internal.c \ + src/crypto/md5.c \ + src/crypto/md5-internal.c \ + src/crypto/md5-non-fips.c \ + src/crypto/milenage.c \ + src/crypto/ms_funcs.c \ + src/crypto/rc4.c \ + src/crypto/sha1.c \ + src/crypto/sha1-internal.c \ + src/crypto/sha1-pbkdf2.c \ + src/crypto/sha1-tlsprf.c \ + src/crypto/sha1-tprf.c \ + src/crypto/sha256.c \ + src/crypto/sha256-internal.c \ + src/crypto/crypto_internal.c \ + src/crypto/crypto_internal-cipher.c \ + src/crypto/crypto_internal-modexp.c \ + src/crypto/crypto_internal-rsa.c \ + src/crypto/tls_internal.c \ + src/crypto/fips_prf_internal.c + +TLS_SRCS = \ + src/tls/asn1.c \ + src/tls/bignum.c \ + src/tls/pkcs1.c \ + src/tls/pkcs5.c \ + src/tls/pkcs8.c \ + src/tls/rsa.c \ + src/tls/tlsv1_client.c \ + src/tls/tlsv1_client_read.c \ + src/tls/tlsv1_client_write.c \ + src/tls/tlsv1_common.c \ + src/tls/tlsv1_cred.c \ + src/tls/tlsv1_record.c \ + src/tls/tlsv1_server.c \ + src/tls/tlsv1_server_read.c \ + src/tls/tlsv1_server_write.c \ + src/tls/x509v3.c + - libeap_la_SOURCES = $(SOURCES_BOTH) $(UTILS_SRCS) $(CRYPTO_SRCS) $(TLS_SRCS) ++libeap_la_SOURCES = $(SOURCES_BOTH) $(SOURCES_peer) $(UTILS_SRCS) $(CRYPTO_SRCS) $(TLS_SRCS) + +noinst_LTLIBRARIES = libeap.la diff --cc mech_eap/Makefile.am index ad26e56,0000000..d6ceac2 mode 100644,000000..100644 --- a/mech_eap/Makefile.am +++ b/mech_eap/Makefile.am @@@ -1,130 -1,0 +1,130 @@@ +AUTOMAKE_OPTIONS = foreign + +gssincludedir = $(includedir)/gssapi +gssinclude_HEADERS = gssapi_eap.h + +EAP_CFLAGS = -I$(srcdir)/../libeap/src -I$(srcdir)/../libeap/src/common -I$(srcdir)/../libeap/src/eap_common \ + -I$(srcdir)/../libeap/src/utils -DIEEE8021X_EAPOL + +gssdir = $(libdir)/gss +gss_LTLIBRARIES = mech_eap.la + +mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\" +mech_eap_la_CFLAGS = -Werror -Wall -Wunused-parameter \ + @KRB5_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS) +mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter \ + @KRB5_CFLAGS@ @RADSEC_CFLAGS@ \ + @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS) +mech_eap_la_LDFLAGS = -avoid-version -module \ + -export-symbols mech_eap.exports -no-undefined \ + @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@ +mech_eap_la_LIBADD = @KRB5_LIBS@ ../libeap/libeap.la @RADSEC_LIBS@ \ + @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@ + +mech_eap_la_SOURCES = \ + accept_sec_context.c \ + authorize_localname.c \ + acquire_cred.c \ + acquire_cred_with_password.c \ + add_cred.c \ + add_cred_with_password.c \ + canonicalize_name.c \ + compare_name.c \ + context_time.c \ + delete_name_attribute.c \ + delete_sec_context.c \ + display_name.c \ + display_name_ext.c \ + display_status.c \ + duplicate_name.c \ + eap_mech.c \ + export_name.c \ + export_name_composite.c \ + export_sec_context.c \ + get_mic.c \ + get_name_attribute.c \ + gsseap_err.c \ + import_name.c \ + import_sec_context.c \ + indicate_mechs.c \ + init_sec_context.c \ + inquire_attrs_for_mech.c \ + inquire_context.c \ + inquire_cred.c \ + inquire_cred_by_oid.c \ + inquire_mech_for_saslname.c \ + inquire_mechs_for_name.c \ + inquire_name.c \ + inquire_names_for_mech.c \ + inquire_saslname_for_mech.c \ + inquire_sec_context_by_oid.c \ + map_name_to_any.c \ + process_context_token.c \ + pseudo_random.c \ + radsec_err.c \ + release_any_name_mapping.c \ + release_cred.c \ + release_name.c \ + release_oid.c \ + set_name_attribute.c \ + set_cred_option.c \ + set_sec_context_option.c \ + store_cred.c \ + unwrap.c \ + unwrap_iov.c \ + util_attr.cpp \ + util_base64.c \ + util_buffer.c \ + util_context.c \ + util_cksum.c \ + util_cred.c \ + util_crypt.c \ + util_json.cpp \ + util_krb.c \ + util_lucid.c \ + util_mech.c \ + util_name.c \ + util_oid.c \ + util_ordering.c \ + util_radius.cpp \ + util_saml.cpp \ + util_shib.cpp \ + util_sm.c \ + util_token.c \ + verify_mic.c \ + wrap.c \ + wrap_iov.c \ + wrap_iov_length.c \ + wrap_size_limit.c + +BUILT_SOURCES = gsseap_err.c radsec_err.c + +if GSSEAP_ENABLE_REAUTH +mech_eap_la_SOURCES += util_reauth.c + + + +if !HEIMDAL +krb5pluginsdir = $(libdir)/krb5/plugins/authdata +krb5plugins_LTLIBRARIES = radius_ad.la + +radius_ad_la_CFLAGS = -Werror -Wall -Wunused-parameter \ - @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@ ++ @KRB5_CFLAGS@ $(EAP_CFLAGS) @RADSEC_CFLAGS@ @TARGET_CFLAGS@ +radius_ad_la_LDFLAGS = -avoid-version -module \ + -export-symbols radius_ad.exports -no-undefined +radius_ad_la_LIBADD = @KRB5_LIBS@ +radius_ad_la_SOURCES = util_adshim.c +endif +endif + +gsseap_err.h gsseap_err.c: gsseap_err.et + $(COMPILE_ET) $< + +radsec_err.h radsec_err.c: radsec_err.et + $(COMPILE_ET) $< + +radsec_err.c: radsec_err.h + +clean-generic: + rm -f gsseap_err.[ch] radsec_err.[ch] +