X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fopenssl;h=c56c24af04f4733c5780921aea61236f4adeff97;hp=05d28ef20e312b9da2e895b35f00676fc77cffaf;hb=HEAD;hpb=be838808e1d3e7dc52fd25621bda18507294919a

diff --git a/lfs/openssl b/lfs/openssl
index 05d28ef20e..6950357424 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.1a
+VER        = 3.2.1
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -35,11 +35,6 @@ TARGET = $(DIR_INFO)/$(THISAPP)$(KCFG)
 
 CFLAGS += -DPURIFY -Wa,--noexecstack
 
-# Enable SSE2 for this build
-ifeq "$(KCFG)" "-sse2"
-  CFLAGS+= -march=i686 -mmmx -msse -msse2 -mfpmath=sse
-endif
-
 export RPM_OPT_FLAGS = $(CFLAGS)
 
 CONFIGURE_OPTIONS = \
@@ -57,26 +52,16 @@ CONFIGURE_OPTIONS = \
 	no-aria \
 	$(OPENSSL_ARCH)
 
-ifeq "$(IS_64BIT)" "1"
-	OPENSSL_ARCH = linux-generic64
-else
-	OPENSSL_ARCH = linux-generic32
-endif
-
 ifeq "$(BUILD_ARCH)" "aarch64"
 	OPENSSL_ARCH = linux-aarch64
 endif
 
-ifeq "$(BUILD_ARCH)" "x86_64"
-	OPENSSL_ARCH = linux-x86_64
+ifeq "$(BUILD_ARCH)" "riscv64"
+	OPENSSL_ARCH = linux64-riscv64
 endif
 
-ifeq "$(BUILD_ARCH)" "i586"
-	OPENSSL_ARCH = linux-elf
-
-  ifneq "$(KCFG)" "-sse2"
-	OPENSSL_ARCH += no-sse2
-  endif
+ifeq "$(BUILD_ARCH)" "x86_64"
+	OPENSSL_ARCH = linux-x86_64
 endif
 
 ###############################################################################
@@ -87,7 +72,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 963deb2272d6be7d4c2458afd2517b73
+$(DL_FILE)_BLAKE2 = 960222e0305166160e5ab000e29650b92063bf726551ee9ad46060166d99738d1e3a5b86fd28b14c8f4fb3a72f5aa70850defb87c02990acff3dbcbdac40b347
 
 install : $(TARGET)
 
@@ -95,10 +80,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -107,8 +92,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -117,7 +102,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.1a-default-cipherlist.patch
 
 	# Apply our CFLAGS
 	cd $(DIR_APP) && sed -i Configure \
@@ -130,17 +114,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		$(CFLAGS) $(LDFLAGS)
 
 	cd $(DIR_APP) && make depend
-	cd $(DIR_APP) && make
-
-ifeq "$(KCFG)" "-sse2"
-	-mkdir -pv /usr/lib/sse2
-	cd $(DIR_APP) && install -m 755 \
-		libcrypto.so.1.1 /usr/lib/sse2
-else
-	# Install everything.
+	cd $(DIR_APP) && make $(MAKETUNING)
+
+	# Install everything
 	cd $(DIR_APP) && make install
 	install -m 0644 $(DIR_SRC)/config/ssl/openssl.cnf /etc/ssl
-endif
+
+	# Install RFC 7919 defined standard group ffdhe4096
+	install -m 0644 $(DIR_SRC)/config/ssl/ffdhe4096.pem /etc/ssl
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)