Moved TLS functions to a common area.

In preparation for doing RadSec

diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 79844cd..fbab172 100644 (file)
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -9,6 +9,9 @@ SERVER_SRCS     = acct.c auth.c client.c conffile.c crypt.c exec.c files.c \
                  radiusd.c stats.c soh.c \
                  session.c threads.c util.c valuepair.c version.c  \
                  xlat.c process.c realms.c evaluate.c vmps.c detail.c
+ifneq ($(OPENSSL_LIBS),)
+SERVER_SRCS    += cb.c tls.c
+endif
 
 SERVER_OBJS    += $(SERVER_SRCS:.c=.lo)
 

diff --git a/src/modules/rlm_eap/libeap/cb.c b/src/main/cb.c
similarity index 100%
rename from src/modules/rlm_eap/libeap/cb.c
rename to src/main/cb.c

diff --git a/src/modules/rlm_eap/libeap/tls.c b/src/main/tls.c
similarity index 100%
rename from src/modules/rlm_eap/libeap/tls.c
rename to src/main/tls.c

diff --git a/src/modules/rlm_eap/libeap/Makefile b/src/modules/rlm_eap/libeap/Makefile
index 47f104b..fa8f874 100644 (file)
--- a/src/modules/rlm_eap/libeap/Makefile
+++ b/src/modules/rlm_eap/libeap/Makefile
@@ -8,7 +8,7 @@ include ../../../../Make.inc
 
 SRCS           = eapcommon.c eapcrypto.c eapsimlib.c fips186prf.c
 ifneq ($(OPENSSL_LIBS),)
-SRCS           += cb.c eap_tls.c mppe_keys.c tls.c
+SRCS           += eap_tls.c mppe_keys.c
 endif
 LT_OBJS                = $(SRCS:.c=.lo)
 INCLUDES       = eap_types.h eap_tls.h