From 9d545f0add00347d1801dd38b86bb3452f140a1f Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Fri, 13 Nov 2015 13:51:56 +0000 Subject: OpenSSL: use more sensible defaults --- sdk/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sdk/Makefile b/sdk/Makefile index f26da00..f1f96ec 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -88,6 +88,12 @@ FREETYPE_ENV := LIBPNG_CFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --cflag # per target environments LIBJPEG_TURBO_BUILDDIR:=$(BUILDDIR)/libjpegturbo +# OpenSSL defaults: +# * Disable IDEA, MCD2, RC5, and zlib +# * Enable TLS extensions +# * Disable SSLv2 and SSLv3 +EXTRAARGS_OPENSSL := no-idea no-mdc2 no-rc5 no-zlib enable-tlsext no-ssl2 no-ssl3 + # Target Specific setup ifeq ($(TARGET),arm-unknown-riscos) SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) spidermonkey.d libjpeg-turbo.d) @@ -349,7 +355,7 @@ $(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDST ifneq ($(realpath $(RECIPES)/patches/openssl/$(TARGET)),) for p in `ls $(RECIPES)/patches/openssl/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done endif - cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-asm no-threads + cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-asm no-threads $(EXTRAARGS_OPENSSL) cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) make install touch $@ -- cgit v1.2.3