From 5ac03256db0fe4ca7e3ad1117d096c3a76368b76 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 9 Jan 2015 09:46:07 +0100 Subject: backported CyaSSL/OpenSSL support for internal webserver instead of MatrixSSL --- release/src/router/Makefile | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'release/src/router/Makefile') diff --git a/release/src/router/Makefile b/release/src/router/Makefile index 3178d881..26dcf47c 100644 --- a/release/src/router/Makefile +++ b/release/src/router/Makefile @@ -55,7 +55,7 @@ obj-y += miniupnpd obj-$(TCONFIG_L2TP) += rp-l2tp obj-$(TCONFIG_PPTP) += pptp-client obj-$(TCONFIG_HTTPS) += openssl -obj-$(TCONFIG_HTTPS) += matrixssl +obj-$(TCONFIG_HTTPS) += cyassl obj-$(TCONFIG_SSH) += dropbear obj-$(TCONFIG_ZEBRA) += zebra # obj-$(TCONFIG_IPP2P) += ipp2p @@ -156,6 +156,7 @@ endif ifeq ($(TCONFIG_SSH),y) install $(LIBDIR)/libutil.so.0 $(TARGETDIR)/lib/ endif + install $(LIBDIR)/libpthread.so.0 $(TARGETDIR)/lib/ @cd $(TARGETDIR) && $(TOP)/others/rootprep.sh @@ -271,23 +272,32 @@ busybox-config: $(MAKE) -C busybox menuconfig -httpd: matrixssl shared nvram mssl +httpd: cyassl shared nvram mssl @$(SEP) @$(MAKE) -C httpd www-install: @$(MAKE) -C www install INSTALLDIR=$(INSTALLDIR)/www TOMATO_EXPERIMENTAL=$(TOMATO_EXPERIMENTAL) -matrixssl: - @$(SEP) - @$(MAKE) -C matrixssl/src +cyassl/stamp-h1: + @cd cyassl && CC=$(CC) AR=$(AR) RANLIB=$(RANLIB) LD=$(LD) \ + CFLAGS="-Os -Wall -fPIC $(EXTRACFLAGS) -ffunction-sections -fdata-sections \ + -DNO_MD4 -DNO_AES -DNO_ERROR_STRINGS -DNO_HC128 -DNO_RABBIT -DNO_PSK -DNO_DSA -DNO_DH -DNO_PWDBASED" \ + LDFLAGS="-ffunction-sections -fdata-sections -Wl,--gc-sections -fPIC" \ + PTHREAD_LIBS="-lpthread" \ + $(CONFIGURE) + @touch cyassl/stamp-h1 -matrixssl-install: - @true +cyassl: cyassl/stamp-h1 + @$(SEP) + @$(MAKE) -C cyassl -matrixssl-clean: - $(MAKE) -C matrixssl/src clean +cyassl-clean: + -@$(MAKE) -C cyassl clean + @rm -f cyassl/stamp-h1 +cyassl-install: + @true openssl-install: install -D openssl/libcrypto.so $(INSTALLDIR)/openssl/usr/lib/libcrypto.so @@ -304,7 +314,7 @@ openssl-install: # install -D openssl/libssl.so $(INSTALLDIR)/openssl/usr/lib/libssl.so # $(STRIP) $(INSTALLDIR)/openssl/usr/lib/libssl.so -mssl: matrixssl +mssl: cyassl mdu: shared mssl -- cgit v1.2.3-54-g00ecf