###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2022 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 #
include Config
-VER = 1.1.1b
+VER = 1.1.1s
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
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 = \
OPENSSL_ARCH = linux-x86_64
endif
-ifeq "$(BUILD_ARCH)" "i586"
- OPENSSL_ARCH = linux-elf
-
- ifneq "$(KCFG)" "-sse2"
- OPENSSL_ARCH += no-sse2
- endif
-endif
-
###############################################################################
# Top-level Rules
###############################################################################
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4532712e7bcc9414f5bce995e4e13930
+$(DL_FILE)_BLAKE2 = ecd19eaf84dbc80448b51651abe52a89cc0052f024537959c4ebe61528988f235d661244fce6967159a876dd038c817bad19df742e828ca1cbae97ce6a4124bb
install : $(TARGET)
download :$(patsubst %,$(DIR_DL)/%,$(objects))
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
###############################################################################
# Installation Details
$(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
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.1d-default-cipherlist.patch
# Apply our CFLAGS
cd $(DIR_APP) && sed -i Configure \
cd $(DIR_APP) && make depend
cd $(DIR_APP) && make $(MAKETUNING)
-ifeq "$(KCFG)" "-sse2"
- -mkdir -pv /usr/lib/sse2
- cd $(DIR_APP) && install -m 755 \
- libcrypto.so.1.1 /usr/lib/sse2
-else
- # Install everything.
+ # 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)