From 2b6b9a0433fef9e3a1d34765d90ecd04da8ff649 Mon Sep 17 00:00:00 2001 From: creme Date: Wed, 3 Jun 2020 16:38:41 +0200 Subject: [PATCH 1/8] fastd2: 'secure handshakes' configuration is deprecated, insecure handshakes are not supported anymore --- feeds/19.07/feeds-own/fastd/files/fastd.config | 3 --- feeds/19.07/feeds-own/fastd/files/fastd.init | 1 - 2 files changed, 4 deletions(-) diff --git a/feeds/19.07/feeds-own/fastd/files/fastd.config b/feeds/19.07/feeds-own/fastd/files/fastd.config index b47cc65a..c3a9ad24 100644 --- a/feeds/19.07/feeds-own/fastd/files/fastd.config +++ b/feeds/19.07/feeds-own/fastd/files/fastd.config @@ -52,9 +52,6 @@ config fastd sample_config # WARNING: Only enable this if you know what you are doing, as this can lead to forwarding loops! option forward 0 - # Disable for compatiblity with fastd v10 and older - option secure_handshakes 1 - # Set a packet mark to filter for with iptables or ip rules # option packet_mark 42 diff --git a/feeds/19.07/feeds-own/fastd/files/fastd.init b/feeds/19.07/feeds-own/fastd/files/fastd.init index 3a209223..e1301e40 100644 --- a/feeds/19.07/feeds-own/fastd/files/fastd.init +++ b/feeds/19.07/feeds-own/fastd/files/fastd.init @@ -76,7 +76,6 @@ config_string_pmtu='pmtu $(yes_no "$value");' config_string_forward='forward $(yes_no "$value");' config_string_hide_ip_addresses='hide ip addresses $(yes_no "$value");' config_string_hide_mac_addresses='hide mac addresses $(yes_no "$value");' -config_string_secure_handshakes='secure handshakes $(yes_no "$value");' config_string_packet_mark='packet mark $(guard_value "$value");' config_string_peer='peer $(escape_string "$value") {' -- GitLab From 8db53e1d7e495a7063dd06caa4c59f9c369fd4d5 Mon Sep 17 00:00:00 2001 From: creme Date: Wed, 3 Jun 2020 16:38:50 +0200 Subject: [PATCH 2/8] update fastd2 to v19 --- feeds/19.07/feeds-own/fastd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feeds/19.07/feeds-own/fastd/Makefile b/feeds/19.07/feeds-own/fastd/Makefile index 15d5201d..1bb8b097 100644 --- a/feeds/19.07/feeds-own/fastd/Makefile +++ b/feeds/19.07/feeds-own/fastd/Makefile @@ -18,7 +18,7 @@ PKG_NAME:=fastd #git PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/NeoRaider/fastd.git -PKG_REV:=8dc1ed3a1ee9af731205a7a4e167c1c2d1b3d819 +PKG_REV:=92bc1c105119c08e340045a157e9bace9a04bb6a PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_REV) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz -- GitLab From 4f6508db369369336117531fdef3939b272d9dba Mon Sep 17 00:00:00 2001 From: creme Date: Fri, 26 Jun 2020 14:11:02 +0200 Subject: [PATCH 3/8] update fastd2 to v19 (feed 18.06 and 19.07) --- feeds/18.06/feeds-own/fastd/Makefile | 16 ++-------------- feeds/19.07/feeds-own/fastd/Makefile | 14 +------------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/feeds/18.06/feeds-own/fastd/Makefile b/feeds/18.06/feeds-own/fastd/Makefile index 15d5201d..5d6e26ef 100644 --- a/feeds/18.06/feeds-own/fastd/Makefile +++ b/feeds/18.06/feeds-own/fastd/Makefile @@ -18,7 +18,7 @@ PKG_NAME:=fastd #git PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/NeoRaider/fastd.git -PKG_REV:=8dc1ed3a1ee9af731205a7a4e167c1c2d1b3d819 +PKG_REV:=92bc1c105119c08e340045a157e9bace9a04bb6a PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_REV) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz @@ -32,7 +32,6 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC \ CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305 \ CONFIG_FASTD_ENABLE_METHOD_NULL \ - CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305 \ CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR \ CONFIG_FASTD_ENABLE_CIPHER_NULL \ CONFIG_FASTD_ENABLE_CIPHER_SALSA20 \ @@ -41,8 +40,7 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_WITH_CMDLINE_USER \ CONFIG_FASTD_WITH_CMDLINE_LOGGING \ CONFIG_FASTD_WITH_CMDLINE_OPERATION \ - CONFIG_FASTD_WITH_CMDLINE_COMMANDS \ - CONFIG_FASTD_WITH_VERIFY + CONFIG_FASTD_WITH_CMDLINE_COMMANDS # IMPORTANT: nacl can be replaced by libsodium. but this would increase size by 110kbyte # Also a more efficient chiper 20/12 is not supported by libsodium @@ -74,7 +72,6 @@ CMAKE_OPTIONS += \ -DWITH_METHOD_GENERIC_GMAC:BOOL=FALSE \ -DWITH_METHOD_GENERIC_POLY1305:BOOL=FALSE \ -DWITH_METHOD_NULL:BOOL=FALSE \ - -DWITH_METHOD_XSALSA20_POLY1305:BOOL=FALSE \ -DWITH_CIPHER_AES128_CTR:BOOL=FALSE \ -DWITH_CIPHER_NULL:BOOL=FALSE \ -DWITH_CIPHER_SALSA20:BOOL=FALSE \ @@ -84,7 +81,6 @@ CMAKE_OPTIONS += \ -DWITH_CMDLINE_LOGGING:BOOL=FALSE \ -DWITH_CMDLINE_OPERATION:BOOL=FALSE \ -DWITH_CMDLINE_COMMANDS:BOOL=FALSE \ - -DWITH_VERIFY:BOOL=FALSE \ -DWITH_CAPABILITIES:BOOL=FALSE \ -DENABLE_SYSTEMD:BOOL=FALSE \ -DENABLE_LIBSODIUM:BOOL=FALSE \ @@ -111,10 +107,6 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_NULL),y) CMAKE_OPTIONS += -DWITH_METHOD_NULL:BOOL=TRUE endif -ifeq ($(CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305),y) -CMAKE_OPTIONS += -DWITH_METHOD_XSALSA20_POLY1305:BOOL=TRUE -endif - ifeq ($(CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR),y) CMAKE_OPTIONS += -DWITH_CIPHER_AES128_CTR:BOOL=TRUE @@ -154,10 +146,6 @@ ifeq ($(CONFIG_FASTD_WITH_CMDLINE_COMMANDS),y) CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE endif -ifeq ($(CONFIG_FASTD_WITH_VERIFY),y) -CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE -endif - define Package/fastd/description Fast and secure tunneling daemon, which is optimized on small code size and few dependencies diff --git a/feeds/19.07/feeds-own/fastd/Makefile b/feeds/19.07/feeds-own/fastd/Makefile index 1bb8b097..5d6e26ef 100644 --- a/feeds/19.07/feeds-own/fastd/Makefile +++ b/feeds/19.07/feeds-own/fastd/Makefile @@ -32,7 +32,6 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC \ CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305 \ CONFIG_FASTD_ENABLE_METHOD_NULL \ - CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305 \ CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR \ CONFIG_FASTD_ENABLE_CIPHER_NULL \ CONFIG_FASTD_ENABLE_CIPHER_SALSA20 \ @@ -41,8 +40,7 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_WITH_CMDLINE_USER \ CONFIG_FASTD_WITH_CMDLINE_LOGGING \ CONFIG_FASTD_WITH_CMDLINE_OPERATION \ - CONFIG_FASTD_WITH_CMDLINE_COMMANDS \ - CONFIG_FASTD_WITH_VERIFY + CONFIG_FASTD_WITH_CMDLINE_COMMANDS # IMPORTANT: nacl can be replaced by libsodium. but this would increase size by 110kbyte # Also a more efficient chiper 20/12 is not supported by libsodium @@ -74,7 +72,6 @@ CMAKE_OPTIONS += \ -DWITH_METHOD_GENERIC_GMAC:BOOL=FALSE \ -DWITH_METHOD_GENERIC_POLY1305:BOOL=FALSE \ -DWITH_METHOD_NULL:BOOL=FALSE \ - -DWITH_METHOD_XSALSA20_POLY1305:BOOL=FALSE \ -DWITH_CIPHER_AES128_CTR:BOOL=FALSE \ -DWITH_CIPHER_NULL:BOOL=FALSE \ -DWITH_CIPHER_SALSA20:BOOL=FALSE \ @@ -84,7 +81,6 @@ CMAKE_OPTIONS += \ -DWITH_CMDLINE_LOGGING:BOOL=FALSE \ -DWITH_CMDLINE_OPERATION:BOOL=FALSE \ -DWITH_CMDLINE_COMMANDS:BOOL=FALSE \ - -DWITH_VERIFY:BOOL=FALSE \ -DWITH_CAPABILITIES:BOOL=FALSE \ -DENABLE_SYSTEMD:BOOL=FALSE \ -DENABLE_LIBSODIUM:BOOL=FALSE \ @@ -111,10 +107,6 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_NULL),y) CMAKE_OPTIONS += -DWITH_METHOD_NULL:BOOL=TRUE endif -ifeq ($(CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305),y) -CMAKE_OPTIONS += -DWITH_METHOD_XSALSA20_POLY1305:BOOL=TRUE -endif - ifeq ($(CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR),y) CMAKE_OPTIONS += -DWITH_CIPHER_AES128_CTR:BOOL=TRUE @@ -154,10 +146,6 @@ ifeq ($(CONFIG_FASTD_WITH_CMDLINE_COMMANDS),y) CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE endif -ifeq ($(CONFIG_FASTD_WITH_VERIFY),y) -CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE -endif - define Package/fastd/description Fast and secure tunneling daemon, which is optimized on small code size and few dependencies -- GitLab From 9e02e7d4ac0b797ec8beb3bc9a2e6980b36a93aa Mon Sep 17 00:00:00 2001 From: creme Date: Fri, 26 Jun 2020 14:13:44 +0200 Subject: [PATCH 4/8] remove old fast secure handshake option in feed 18.06 --- feeds/18.06/feeds-own/fastd/files/fastd.config | 3 --- feeds/18.06/feeds-own/fastd/files/fastd.init | 1 - 2 files changed, 4 deletions(-) diff --git a/feeds/18.06/feeds-own/fastd/files/fastd.config b/feeds/18.06/feeds-own/fastd/files/fastd.config index b47cc65a..c3a9ad24 100644 --- a/feeds/18.06/feeds-own/fastd/files/fastd.config +++ b/feeds/18.06/feeds-own/fastd/files/fastd.config @@ -52,9 +52,6 @@ config fastd sample_config # WARNING: Only enable this if you know what you are doing, as this can lead to forwarding loops! option forward 0 - # Disable for compatiblity with fastd v10 and older - option secure_handshakes 1 - # Set a packet mark to filter for with iptables or ip rules # option packet_mark 42 diff --git a/feeds/18.06/feeds-own/fastd/files/fastd.init b/feeds/18.06/feeds-own/fastd/files/fastd.init index 3a209223..e1301e40 100644 --- a/feeds/18.06/feeds-own/fastd/files/fastd.init +++ b/feeds/18.06/feeds-own/fastd/files/fastd.init @@ -76,7 +76,6 @@ config_string_pmtu='pmtu $(yes_no "$value");' config_string_forward='forward $(yes_no "$value");' config_string_hide_ip_addresses='hide ip addresses $(yes_no "$value");' config_string_hide_mac_addresses='hide mac addresses $(yes_no "$value");' -config_string_secure_handshakes='secure handshakes $(yes_no "$value");' config_string_packet_mark='packet mark $(guard_value "$value");' config_string_peer='peer $(escape_string "$value") {' -- GitLab From f0f01d683efeece599a31efc28ca0dfb9e2ebeb7 Mon Sep 17 00:00:00 2001 From: creme Date: Wed, 3 Jun 2020 16:38:41 +0200 Subject: [PATCH 5/8] fastd2: 'secure handshakes' configuration is deprecated, insecure handshakes are not supported anymore --- feeds/19.07/feeds-own/fastd/files/fastd.config | 3 --- feeds/19.07/feeds-own/fastd/files/fastd.init | 1 - 2 files changed, 4 deletions(-) diff --git a/feeds/19.07/feeds-own/fastd/files/fastd.config b/feeds/19.07/feeds-own/fastd/files/fastd.config index b47cc65a..c3a9ad24 100644 --- a/feeds/19.07/feeds-own/fastd/files/fastd.config +++ b/feeds/19.07/feeds-own/fastd/files/fastd.config @@ -52,9 +52,6 @@ config fastd sample_config # WARNING: Only enable this if you know what you are doing, as this can lead to forwarding loops! option forward 0 - # Disable for compatiblity with fastd v10 and older - option secure_handshakes 1 - # Set a packet mark to filter for with iptables or ip rules # option packet_mark 42 diff --git a/feeds/19.07/feeds-own/fastd/files/fastd.init b/feeds/19.07/feeds-own/fastd/files/fastd.init index 3a209223..e1301e40 100644 --- a/feeds/19.07/feeds-own/fastd/files/fastd.init +++ b/feeds/19.07/feeds-own/fastd/files/fastd.init @@ -76,7 +76,6 @@ config_string_pmtu='pmtu $(yes_no "$value");' config_string_forward='forward $(yes_no "$value");' config_string_hide_ip_addresses='hide ip addresses $(yes_no "$value");' config_string_hide_mac_addresses='hide mac addresses $(yes_no "$value");' -config_string_secure_handshakes='secure handshakes $(yes_no "$value");' config_string_packet_mark='packet mark $(guard_value "$value");' config_string_peer='peer $(escape_string "$value") {' -- GitLab From e7b80e988cc31d66693d79d9ca560b477c648c1e Mon Sep 17 00:00:00 2001 From: creme Date: Wed, 3 Jun 2020 16:38:50 +0200 Subject: [PATCH 6/8] update fastd2 to v19 --- feeds/19.07/feeds-own/fastd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feeds/19.07/feeds-own/fastd/Makefile b/feeds/19.07/feeds-own/fastd/Makefile index df1db2cc..47fc407b 100644 --- a/feeds/19.07/feeds-own/fastd/Makefile +++ b/feeds/19.07/feeds-own/fastd/Makefile @@ -18,7 +18,7 @@ PKG_NAME:=fastd #git PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/NeoRaider/fastd.git -PKG_REV:=8dc1ed3a1ee9af731205a7a4e167c1c2d1b3d819 +PKG_REV:=92bc1c105119c08e340045a157e9bace9a04bb6a PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_REV) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz -- GitLab From bbd3ca6cb5e91cd10f6453d3eb30c4ebe2d3c87c Mon Sep 17 00:00:00 2001 From: creme Date: Fri, 26 Jun 2020 14:11:02 +0200 Subject: [PATCH 7/8] update fastd2 to v19 (feed 18.06 and 19.07) --- feeds/18.06/feeds-own/fastd/Makefile | 16 ++-------------- feeds/19.07/feeds-own/fastd/Makefile | 14 +------------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/feeds/18.06/feeds-own/fastd/Makefile b/feeds/18.06/feeds-own/fastd/Makefile index df1db2cc..709747d4 100644 --- a/feeds/18.06/feeds-own/fastd/Makefile +++ b/feeds/18.06/feeds-own/fastd/Makefile @@ -18,7 +18,7 @@ PKG_NAME:=fastd #git PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/NeoRaider/fastd.git -PKG_REV:=8dc1ed3a1ee9af731205a7a4e167c1c2d1b3d819 +PKG_REV:=92bc1c105119c08e340045a157e9bace9a04bb6a PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_REV) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz @@ -32,7 +32,6 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC \ CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305 \ CONFIG_FASTD_ENABLE_METHOD_NULL \ - CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305 \ CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR \ CONFIG_FASTD_ENABLE_CIPHER_NULL \ CONFIG_FASTD_ENABLE_CIPHER_SALSA20 \ @@ -41,8 +40,7 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_WITH_CMDLINE_USER \ CONFIG_FASTD_WITH_CMDLINE_LOGGING \ CONFIG_FASTD_WITH_CMDLINE_OPERATION \ - CONFIG_FASTD_WITH_CMDLINE_COMMANDS \ - CONFIG_FASTD_WITH_VERIFY + CONFIG_FASTD_WITH_CMDLINE_COMMANDS # IMPORTANT: nacl can be replaced by libsodium. but this would increase size by 110kbyte # Also a more efficient chiper 20/12 is not supported by libsodium @@ -75,7 +73,6 @@ CMAKE_OPTIONS += \ -DWITH_METHOD_GENERIC_GMAC:BOOL=FALSE \ -DWITH_METHOD_GENERIC_POLY1305:BOOL=FALSE \ -DWITH_METHOD_NULL:BOOL=FALSE \ - -DWITH_METHOD_XSALSA20_POLY1305:BOOL=FALSE \ -DWITH_CIPHER_AES128_CTR:BOOL=FALSE \ -DWITH_CIPHER_NULL:BOOL=FALSE \ -DWITH_CIPHER_SALSA20:BOOL=FALSE \ @@ -85,7 +82,6 @@ CMAKE_OPTIONS += \ -DWITH_CMDLINE_LOGGING:BOOL=FALSE \ -DWITH_CMDLINE_OPERATION:BOOL=FALSE \ -DWITH_CMDLINE_COMMANDS:BOOL=FALSE \ - -DWITH_VERIFY:BOOL=FALSE \ -DWITH_CAPABILITIES:BOOL=FALSE \ -DENABLE_SYSTEMD:BOOL=FALSE \ -DENABLE_LIBSODIUM:BOOL=FALSE \ @@ -112,10 +108,6 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_NULL),y) CMAKE_OPTIONS += -DWITH_METHOD_NULL:BOOL=TRUE endif -ifeq ($(CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305),y) -CMAKE_OPTIONS += -DWITH_METHOD_XSALSA20_POLY1305:BOOL=TRUE -endif - ifeq ($(CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR),y) CMAKE_OPTIONS += -DWITH_CIPHER_AES128_CTR:BOOL=TRUE @@ -155,10 +147,6 @@ ifeq ($(CONFIG_FASTD_WITH_CMDLINE_COMMANDS),y) CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE endif -ifeq ($(CONFIG_FASTD_WITH_VERIFY),y) -CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE -endif - define Package/fastd/description Fast and secure tunneling daemon, which is optimized on small code size and few dependencies diff --git a/feeds/19.07/feeds-own/fastd/Makefile b/feeds/19.07/feeds-own/fastd/Makefile index 47fc407b..709747d4 100644 --- a/feeds/19.07/feeds-own/fastd/Makefile +++ b/feeds/19.07/feeds-own/fastd/Makefile @@ -32,7 +32,6 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC \ CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305 \ CONFIG_FASTD_ENABLE_METHOD_NULL \ - CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305 \ CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR \ CONFIG_FASTD_ENABLE_CIPHER_NULL \ CONFIG_FASTD_ENABLE_CIPHER_SALSA20 \ @@ -41,8 +40,7 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_WITH_CMDLINE_USER \ CONFIG_FASTD_WITH_CMDLINE_LOGGING \ CONFIG_FASTD_WITH_CMDLINE_OPERATION \ - CONFIG_FASTD_WITH_CMDLINE_COMMANDS \ - CONFIG_FASTD_WITH_VERIFY + CONFIG_FASTD_WITH_CMDLINE_COMMANDS # IMPORTANT: nacl can be replaced by libsodium. but this would increase size by 110kbyte # Also a more efficient chiper 20/12 is not supported by libsodium @@ -75,7 +73,6 @@ CMAKE_OPTIONS += \ -DWITH_METHOD_GENERIC_GMAC:BOOL=FALSE \ -DWITH_METHOD_GENERIC_POLY1305:BOOL=FALSE \ -DWITH_METHOD_NULL:BOOL=FALSE \ - -DWITH_METHOD_XSALSA20_POLY1305:BOOL=FALSE \ -DWITH_CIPHER_AES128_CTR:BOOL=FALSE \ -DWITH_CIPHER_NULL:BOOL=FALSE \ -DWITH_CIPHER_SALSA20:BOOL=FALSE \ @@ -85,7 +82,6 @@ CMAKE_OPTIONS += \ -DWITH_CMDLINE_LOGGING:BOOL=FALSE \ -DWITH_CMDLINE_OPERATION:BOOL=FALSE \ -DWITH_CMDLINE_COMMANDS:BOOL=FALSE \ - -DWITH_VERIFY:BOOL=FALSE \ -DWITH_CAPABILITIES:BOOL=FALSE \ -DENABLE_SYSTEMD:BOOL=FALSE \ -DENABLE_LIBSODIUM:BOOL=FALSE \ @@ -112,10 +108,6 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_NULL),y) CMAKE_OPTIONS += -DWITH_METHOD_NULL:BOOL=TRUE endif -ifeq ($(CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305),y) -CMAKE_OPTIONS += -DWITH_METHOD_XSALSA20_POLY1305:BOOL=TRUE -endif - ifeq ($(CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR),y) CMAKE_OPTIONS += -DWITH_CIPHER_AES128_CTR:BOOL=TRUE @@ -155,10 +147,6 @@ ifeq ($(CONFIG_FASTD_WITH_CMDLINE_COMMANDS),y) CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE endif -ifeq ($(CONFIG_FASTD_WITH_VERIFY),y) -CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE -endif - define Package/fastd/description Fast and secure tunneling daemon, which is optimized on small code size and few dependencies -- GitLab From a1ede5ab18aae4c9075dffdf8973ab0fe7101a19 Mon Sep 17 00:00:00 2001 From: creme Date: Fri, 26 Jun 2020 14:13:44 +0200 Subject: [PATCH 8/8] remove old fast secure handshake option in feed 18.06 --- feeds/18.06/feeds-own/fastd/files/fastd.config | 3 --- feeds/18.06/feeds-own/fastd/files/fastd.init | 1 - 2 files changed, 4 deletions(-) diff --git a/feeds/18.06/feeds-own/fastd/files/fastd.config b/feeds/18.06/feeds-own/fastd/files/fastd.config index b47cc65a..c3a9ad24 100644 --- a/feeds/18.06/feeds-own/fastd/files/fastd.config +++ b/feeds/18.06/feeds-own/fastd/files/fastd.config @@ -52,9 +52,6 @@ config fastd sample_config # WARNING: Only enable this if you know what you are doing, as this can lead to forwarding loops! option forward 0 - # Disable for compatiblity with fastd v10 and older - option secure_handshakes 1 - # Set a packet mark to filter for with iptables or ip rules # option packet_mark 42 diff --git a/feeds/18.06/feeds-own/fastd/files/fastd.init b/feeds/18.06/feeds-own/fastd/files/fastd.init index 3a209223..e1301e40 100644 --- a/feeds/18.06/feeds-own/fastd/files/fastd.init +++ b/feeds/18.06/feeds-own/fastd/files/fastd.init @@ -76,7 +76,6 @@ config_string_pmtu='pmtu $(yes_no "$value");' config_string_forward='forward $(yes_no "$value");' config_string_hide_ip_addresses='hide ip addresses $(yes_no "$value");' config_string_hide_mac_addresses='hide mac addresses $(yes_no "$value");' -config_string_secure_handshakes='secure handshakes $(yes_no "$value");' config_string_packet_mark='packet mark $(guard_value "$value");' config_string_peer='peer $(escape_string "$value") {' -- GitLab