openssl: Disable SSLv2 and SSLv3.

Fixes #10712.

diff --git a/lfs/crda b/lfs/crda
index 8bee2584ba496dfdc79a6d00773882232365badf..2b1aff81622eb70747b23cfdc67df4bbd0e97895 100644 (file)
--- a/lfs/crda
+++ b/lfs/crda
@@ -71,6 +71,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/crda-3.13-crypto_use_optional.patch
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/openssl b/lfs/openssl
index eae2c6e53aa8b7d7c1ba10314d0cd41c9d2d95ff..82f26bd25c31fad31899e3d31077a83592158be9 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -105,6 +105,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                no-mdc2 \
                no-rc5 \
                no-srp \
+               no-ssl2 \
+               no-ssl3 \
                $(CONFIGURE_ARGS) \
                -DSSL_FORBID_ENULL \
                -DHAVE_CRYPTODEV \

diff --git a/src/patches/crda-3.13-crypto_use_optional.patch b/src/patches/crda-3.13-crypto_use_optional.patch
new file mode 100644 (file)
index 0000000..56ad6b7
--- /dev/null
+++ b/src/patches/crda-3.13-crypto_use_optional.patch
@@ -0,0 +1,22 @@
+Submitted By: hauke from OpenWRT
+Date: 2009-04-17
+Initial Package Version: 1.0.2
+Origin: https://dev.openwrt.org/changeset/15405/trunk/package/crda/patches/101-make_crypto_use_optional.patch
+Description: The patch was modified for version crda-3.13 by Erik Kapfer <erik.kapfer@ipfire.org>..
+This patch provides the following improvements:
+    * Crypto usage is optional.
+
+diff -Nur crda-3.13.orig/Makefile crda-3.13/Makefile
+--- crda-3.13.orig/Makefile    2015-01-12 07:55:08.791183765 +0100
++++ crda-3.13/Makefile 2015-01-12 07:56:35.437381029 +0100
+@@ -43,7 +43,9 @@
+ 
+ $(LIBREG): keys-ssl.c
+ 
+-else
++endif
++
++ifeq ($(USE_GCRYPT),1)
+ CFLAGS += -DUSE_GCRYPT
+ LDLIBS += -lgcrypt
+