From 71984f4052b9334ba7c7b5bca0296011b22305a0 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sun, 22 Oct 2023 20:56:09 -0400 Subject: [PATCH] erlang: enable SSL engine --- ...d-removal-of-deprecated-warning-for-.patch | 35 +++++++++++++++++++ ...ard-coded-disable-of-ENGINE-in-3.0.x.patch | 27 ++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 package/erlang/26.1.2/0003-crypto-Hard-coded-removal-of-deprecated-warning-for-.patch create mode 100644 package/erlang/26.1.2/0004-crypto-Remove-hard-coded-disable-of-ENGINE-in-3.0.x.patch diff --git a/package/erlang/26.1.2/0003-crypto-Hard-coded-removal-of-deprecated-warning-for-.patch b/package/erlang/26.1.2/0003-crypto-Hard-coded-removal-of-deprecated-warning-for-.patch new file mode 100644 index 0000000000..2ad1c69789 --- /dev/null +++ b/package/erlang/26.1.2/0003-crypto-Hard-coded-removal-of-deprecated-warning-for-.patch @@ -0,0 +1,35 @@ +From a5fea43ef5642ac55d2dad2ec2df6c42428f81ba Mon Sep 17 00:00:00 2001 +From: Hans Nilsson +Date: Mon, 1 Aug 2022 18:12:43 +0200 +Subject: [PATCH] crypto: Hard-coded removal of deprecated warning for ENGINE + function calls + +--- + lib/crypto/c_src/Makefile.in | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in +index 1691a7d120..aedc9e7a13 100644 +--- a/lib/crypto/c_src/Makefile.in ++++ b/lib/crypto/c_src/Makefile.in +@@ -209,6 +209,17 @@ endif + # $(V_at)$(INSTALL_DIR) $(OBJDIR) + # $(V_CC) -c -o $@ $(ALL_CFLAGS) $(CRYPTO_NO_DEPRECATE_WARN) $< + ++# ---- Hard-coded removal of deprecated warning for ENGINE function calls ++$(OBJDIR)/engine$(TYPEMARKER).o: engine.c ++ $(V_at)$(INSTALL_DIR) $(OBJDIR) ++ $(V_CC) -c -o $@ $(ALL_CFLAGS) $(CRYPTO_NO_DEPRECATE_WARN) $< ++ ++$(OBJDIR)/pkey$(TYPEMARKER).o: pkey.c ++ $(V_at)$(INSTALL_DIR) $(OBJDIR) ++ $(V_CC) -c -o $@ $(ALL_CFLAGS) $(CRYPTO_NO_DEPRECATE_WARN) $< ++ ++# ---- End of Hard-coded removal of deprecated warning for ENGINE function calls ++ + $(OBJDIR)/%$(TYPEMARKER).o: %.c + $(V_at)$(INSTALL_DIR) $(OBJDIR) + $(V_CC) -MMD -c -o $@ $(ALL_CFLAGS) $< +-- +2.34.1 + diff --git a/package/erlang/26.1.2/0004-crypto-Remove-hard-coded-disable-of-ENGINE-in-3.0.x.patch b/package/erlang/26.1.2/0004-crypto-Remove-hard-coded-disable-of-ENGINE-in-3.0.x.patch new file mode 100644 index 0000000000..4491f13eac --- /dev/null +++ b/package/erlang/26.1.2/0004-crypto-Remove-hard-coded-disable-of-ENGINE-in-3.0.x.patch @@ -0,0 +1,27 @@ +From cd6826e7ea078d424c366504d2ed897bf4f89f3c Mon Sep 17 00:00:00 2001 +From: Hans Nilsson +Date: Mon, 1 Aug 2022 18:14:28 +0200 +Subject: [PATCH] crypto: Remove hard-coded disable of ENGINE in 3.0.x + +--- + lib/crypto/c_src/openssl_config.h | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h +index db49335ec3..cb63f28369 100644 +--- a/lib/crypto/c_src/openssl_config.h ++++ b/lib/crypto/c_src/openssl_config.h +@@ -352,9 +352,7 @@ + /* If OPENSSL_NO_EC is set, there will be an error in ec.h included from engine.h + So if EC is disabled, you can't use Engine either.... + */ +-#if !defined(OPENSSL_NO_ENGINE) && \ +- !defined(HAS_3_0_API) +-/* Disable FIPS for 3.0 temporaryly until the support is added (might core dump) */ ++#if !defined(OPENSSL_NO_ENGINE) + # define HAS_ENGINE_SUPPORT + #endif + #endif +-- +2.34.1 + -- 2.34.1