dist_man8_MANS = pppd.8
check_PROGRAMS =
-utest_chap_SOURCES = chap_ms.c pppcrypt.c utils.c
+utest_chap_SOURCES = chap_ms.c utils.c crypto_ms.c
utest_chap_CPPFLAGS = -DUNIT_TEST
utest_chap_LDFLAGS =
utest_peap_CPPFLAGS = -DUNIT_TEST
utest_peap_LDFLAGS =
+utest_crypto_SOURCES = crypto.c
+utest_crypto_CPPFLAGS = -DUNIT_TEST
+utest_crypto_LDFLAGS =
+
+utest_pppcrypt_SOURCES = crypto_ms.c
+utest_pppcrypt_CPPFLAGS = -DUNIT_TEST_MSCRYPTO
+utest_pppcrypt_LDFLAGS =
+
+check_PROGRAMS += utest_crypto
+
if WITH_SRP
sbin_PROGRAMS += srp-entry
dist_man8_MANS += srp-entry.8
pppd_include_HEADERS = \
cbcp.h \
ccp.h \
- chap-md5.h \
+ chap.h \
chap_ms.h \
- chap-new.h \
+ crypto.h \
+ crypto_ms.h \
eap.h \
- eap-tls.h \
ecp.h \
eui64.h \
fsm.h \
ipv6cp.h \
lcp.h \
magic.h \
- md4.h \
- md5.h \
mppe.h \
- pathnames.h \
- peap.h \
- pppcrypt.h \
+ multilink.h \
pppd.h \
+ options.h \
pppdconf.h \
session.h \
- sha1.h \
+ upap.h
+
+# Headers to be distributed, but not installed in /usr/include/pppd
+noinst_HEADERS = \
+ chap-md5.h \
+ crypto-priv.h \
+ eap-tls.h \
+ pathnames.h \
+ peap.h \
+ pppd-private.h \
spinlock.h \
tls.h \
- tdb.h \
- upap.h
+ tdb.h
pppd_SOURCES = \
auth.c \
ccp.c \
chap-md5.c \
- chap-new.c \
+ chap.c \
demand.c \
eap.c \
ecp.c \
upap.c \
utils.c
-pppd_CPPFLAGS = -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"'
+pppd_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" -DLOCALSTATEDIR=\"${localstatedir}\" -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"'
pppd_LDFLAGS =
pppd_LIBS =
if LINUX
-pppd_SOURCES += sys-linux.c termios_linux.h
+pppd_SOURCES += sys-linux.c
+noinst_HEADERS += termios_linux.h
pppd_LIBS += $(CRYPT_LIBS) $(UTIL_LIBS)
endif
endif
if PPP_WITH_CHAPMS
-pppd_SOURCES += chap_ms.c
-pppd_SOURCES += pppcrypt.c
+pppd_SOURCES += chap_ms.c crypto_ms.c
check_PROGRAMS += utest_chap
+check_PROGRAMS += utest_pppcrypt
else
if WITH_SRP
-pppd_SOURCES += pppcrypt.c
+pppd_SOURCES += crypto_ms.c
+check_PROGRAMS += utest_pppcrypt
endif
endif
check_PROGRAMS += utest_peap
endif
-noinst_LTLIBRARIES = libppp_crypt.la
-libppp_crypt_la_SOURCES=
+noinst_LTLIBRARIES = libppp_crypto.la
+libppp_crypto_la_SOURCES=crypto.c ppp-md5.c ppp-md4.c ppp-sha1.c ppp-des.c
-if !WITH_OPENSSL
-libppp_crypt_la_SOURCES += md4.c md5.c sha1.c
-else
-libppp_crypt_la_CPPFLAGS=$(OPENSSL_INCLUDES)
-libppp_crypt_la_LDFLAGS=$(OPENSSL_LDFLAGS)
-libppp_crypt_la_LIBADD=$(OPENSSL_LIBS)
-if !OPENSSL_HAVE_SHA
-libppp_crypt_la_SOURCES += sha1.c
-endif
-if !OPENSSL_HAVE_MD5
-libppp_crypt_la_SOURCES += md5.c
-endif
-if !OPENSSL_HAVE_MD4
-libppp_crypt_la_SOURCES += md4.c
-endif
+if PPP_WITH_OPENSSL
+libppp_crypto_la_CPPFLAGS=$(OPENSSL_INCLUDES)
+libppp_crypto_la_LDFLAGS=$(OPENSSL_LDFLAGS)
+libppp_crypto_la_LIBADD=$(OPENSSL_LIBS)
endif
-utest_peap_LDADD = libppp_crypt.la
-utest_chap_LDADD = libppp_crypt.la
-pppd_LIBS += libppp_crypt.la
+utest_peap_LDADD = libppp_crypto.la
+utest_chap_LDADD = libppp_crypto.la
+utest_crypto_LDADD = libppp_crypto.la
+utest_pppcrypt_LDADD = libppp_crypto.la
+
+pppd_LIBS += libppp_crypto.la
if WITH_SYSTEMD
pppd_CPPFLAGS += $(SYSTEMD_CFLAGS)