nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update fastd package to v16-2

Browse Source
This commit is contained in:
Matthias Schiffer 2015-01-08 01:27:43 +01:00
parent 77c3be6a37
commit 28f3e182a7
1 changed files with 127 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
patches/packages/openwrt/0002-fastd-update-to-v16.patch
View File

@ -1,18 +1,56 @@
From: Matthias Schiffer <mschiffer@universe-factory.net> From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 15 Nov 2014 18:50:34 +0100 Date: Thu, 8 Jan 2015 01:26:55 +0100
Subject: fastd: update to v16 Subject: fastd: update to v16
diff --git a/net/fastd/Config.in b/net/fastd/Config.in diff --git a/net/fastd/Config.in b/net/fastd/Config.in
index ca4045c..8292245 100644 index ca4045c..5820b97 100644
--- a/net/fastd/Config.in --- a/net/fastd/Config.in
+++ b/net/fastd/Config.in +++ b/net/fastd/Config.in
@@ -80,8 +80,14 @@ config FASTD_WITH_CMDLINE_COMMANDS @@ -11,6 +11,11 @@ config FASTD_ENABLE_METHOD_COMPOSED_GMAC
depends on PACKAGE_fastd
default y
+config FASTD_ENABLE_METHOD_COMPOSED_UMAC
+ bool "Enable composed-umac method provider"
+ depends on PACKAGE_fastd
+ default y
+
config FASTD_ENABLE_METHOD_GENERIC_GMAC
bool "Enable generic-gmac method provider"
depends on PACKAGE_fastd
@@ -21,6 +26,11 @@ config FASTD_ENABLE_METHOD_GENERIC_POLY1305
depends on PACKAGE_fastd
default n default n
config FASTD_WITH_VERIFY +config FASTD_ENABLE_METHOD_GENERIC_UMAC
+ bool "Enable generic-umac method provider"
+ depends on PACKAGE_fastd
+ default y
+
config FASTD_ENABLE_METHOD_NULL
bool "Enable null method"
depends on PACKAGE_fastd
@@ -58,6 +68,11 @@ config FASTD_ENABLE_MAC_GHASH
depends on PACKAGE_fastd
default y
+config FASTD_ENABLE_MAC_UHASH
+ bool "Enable the UHASH message authentication code"
+ depends on PACKAGE_fastd
+ default y
+
config FASTD_WITH_CMDLINE_USER
bool "Include support for setting user/group related options on the command line"
@@ -79,9 +94,15 @@ config FASTD_WITH_CMDLINE_COMMANDS
depends on PACKAGE_fastd
default n
-config FASTD_WITH_VERIFY
- bool "Include support for on-verify handlers" - bool "Include support for on-verify handlers"
- depends on PACKAGE_fastd - depends on PACKAGE_fastd
- default n - default n
+config FASTD_WITH_DYNAMIC_PEERS
+ bool "Include support for on-verify handlers" + bool "Include support for on-verify handlers"
+ depends on PACKAGE_fastd + depends on PACKAGE_fastd
+ default n + default n
@ -25,16 +63,17 @@ index ca4045c..8292245 100644
endmenu endmenu
diff --git a/net/fastd/Makefile b/net/fastd/Makefile diff --git a/net/fastd/Makefile b/net/fastd/Makefile
index 0629cd7..acf973b 100644 index 0629cd7..5140029 100644
--- a/net/fastd/Makefile --- a/net/fastd/Makefile
+++ b/net/fastd/Makefile +++ b/net/fastd/Makefile
@@ -8,13 +8,16 @@ @@ -8,19 +8,24 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fastd PKG_NAME:=fastd
-PKG_VERSION:=14 -PKG_VERSION:=14
-PKG_RELEASE:=1
+PKG_VERSION:=16 +PKG_VERSION:=16
PKG_RELEASE:=1 +PKG_RELEASE:=2
PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net> PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@ -44,21 +83,34 @@ index 0629cd7..acf973b 100644
+PKG_MD5SUM:=135b3083d2743e335738de3bd4bb0c3c +PKG_MD5SUM:=135b3083d2743e335738de3bd4bb0c3c
+ +
+PKG_LICENSE:=BSD-2-Clause +PKG_LICENSE:=BSD-2-Clause
+PKG_LICENSE_FILE:=COPYRIGHT +PKG_LICENSE_FILES:=COPYRIGHT
PKG_CONFIG_DEPENDS:=\ PKG_CONFIG_DEPENDS:=\
CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \ CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
@@ -32,7 +35,8 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC \
+ CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC \
CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC \
CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305 \
+ CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC \
CONFIG_FASTD_ENABLE_METHOD_NULL \
CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305 \
CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR \
@@ -28,11 +33,13 @@ PKG_CONFIG_DEPENDS:=\
CONFIG_FASTD_ENABLE_CIPHER_SALSA20 \
CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 \
CONFIG_FASTD_ENABLE_MAC_GHASH \
+ CONFIG_FASTD_ENABLE_MAC_UHASH \
CONFIG_FASTD_WITH_CMDLINE_USER \
CONFIG_FASTD_WITH_CMDLINE_LOGGING \ CONFIG_FASTD_WITH_CMDLINE_LOGGING \
CONFIG_FASTD_WITH_CMDLINE_OPERATION \ CONFIG_FASTD_WITH_CMDLINE_OPERATION \
CONFIG_FASTD_WITH_CMDLINE_COMMANDS \ CONFIG_FASTD_WITH_CMDLINE_COMMANDS \
- CONFIG_FASTD_WITH_VERIFY - CONFIG_FASTD_WITH_VERIFY
+ CONFIG_FASTD_WITH_VERIFY \ + CONFIG_FASTD_WITH_DYNAMIC_PEERS \
+ CONFIG_FASTD_WITH_STATUS_SOCKET + CONFIG_FASTD_WITH_STATUS_SOCKET
PKG_BUILD_DEPENDS:=nacl libuecc PKG_BUILD_DEPENDS:=nacl libuecc
@@ -43,7 +47,7 @@ include $(INCLUDE_DIR)/cmake.mk @@ -43,7 +50,7 @@ include $(INCLUDE_DIR)/cmake.mk
define Package/fastd define Package/fastd
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
@ -67,26 +119,81 @@ index 0629cd7..acf973b 100644
TITLE:=Fast and Secure Tunneling Daemon TITLE:=Fast and Secure Tunneling Daemon
URL:=https://projects.universe-factory.net/projects/fastd URL:=https://projects.universe-factory.net/projects/fastd
SUBMENU:=VPN SUBMENU:=VPN
@@ -74,6 +78,7 @@ CMAKE_OPTIONS += \ @@ -60,8 +67,10 @@ CMAKE_OPTIONS += \
-DCMAKE_BUILD_TYPE:STRING=MINSIZEREL \
-DWITH_METHOD_CIPHER_TEST:BOOL=FALSE \
-DWITH_METHOD_COMPOSED_GMAC:BOOL=FALSE \
+ -DWITH_METHOD_COMPOSED_UMAC:BOOL=FALSE \
-DWITH_METHOD_GENERIC_GMAC:BOOL=FALSE \
-DWITH_METHOD_GENERIC_POLY1305:BOOL=FALSE \
+ -DWITH_METHOD_GENERIC_UMAC:BOOL=FALSE \
-DWITH_METHOD_NULL:BOOL=FALSE \
-DWITH_METHOD_XSALSA20_POLY1305:BOOL=FALSE \
-DWITH_CIPHER_AES128_CTR:BOOL=FALSE \
@@ -69,11 +78,13 @@ CMAKE_OPTIONS += \
-DWITH_CIPHER_SALSA20:BOOL=FALSE \
-DWITH_CIPHER_SALSA2012:BOOL=FALSE \
-DWITH_MAC_GHASH:BOOL=FALSE \
+ -DWITH_MAC_UHASH:BOOL=FALSE \
-DWITH_CMDLINE_USER:BOOL=FALSE \
-DWITH_CMDLINE_LOGGING:BOOL=FALSE \
-DWITH_CMDLINE_OPERATION:BOOL=FALSE \ -DWITH_CMDLINE_OPERATION:BOOL=FALSE \
-DWITH_CMDLINE_COMMANDS:BOOL=FALSE \ -DWITH_CMDLINE_COMMANDS:BOOL=FALSE \
-DWITH_VERIFY:BOOL=FALSE \ - -DWITH_VERIFY:BOOL=FALSE \
+ -DWITH_DYNAMIC_PEERS:BOOL=FALSE \
+ -DWITH_STATUS_SOCKET:BOOL=FALSE \ + -DWITH_STATUS_SOCKET:BOOL=FALSE \
-DWITH_CAPABILITIES:BOOL=FALSE \ -DWITH_CAPABILITIES:BOOL=FALSE \
-DENABLE_SYSTEMD:BOOL=FALSE \ -DENABLE_SYSTEMD:BOOL=FALSE \
-DENABLE_LIBSODIUM:BOOL=FALSE \ -DENABLE_LIBSODIUM:BOOL=FALSE \
@@ -147,6 +152,10 @@ ifeq ($(CONFIG_FASTD_WITH_VERIFY),y) @@ -88,6 +99,10 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC),y)
CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE CMAKE_OPTIONS += -DWITH_METHOD_COMPOSED_GMAC:BOOL=TRUE
endif endif
+ifeq ($(CONFIG_FASTD_WITH_STATUS_SOCKET),y) +ifeq ($(CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC),y)
+CMAKE_OPTIONS += -DWITH_STATUS_SOCKET:BOOL=TRUE +CMAKE_OPTIONS += -DWITH_METHOD_COMPOSED_UMAC:BOOL=TRUE
+endif
+
ifeq ($(CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC),y)
CMAKE_OPTIONS += -DWITH_METHOD_GENERIC_GMAC:BOOL=TRUE
endif
@@ -96,6 +111,10 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305),y)
CMAKE_OPTIONS += -DWITH_METHOD_GENERIC_POLY1305:BOOL=TRUE
endif
+ifeq ($(CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC),y)
+CMAKE_OPTIONS += -DWITH_METHOD_GENERIC_UMAC:BOOL=TRUE
+endif
+
ifeq ($(CONFIG_FASTD_ENABLE_METHOD_NULL),y)
CMAKE_OPTIONS += -DWITH_METHOD_NULL:BOOL=TRUE
endif
@@ -126,6 +145,10 @@ ifeq ($(CONFIG_FASTD_ENABLE_MAC_GHASH),y)
CMAKE_OPTIONS += -DWITH_MAC_GHASH:BOOL=TRUE
endif
+ifeq ($(CONFIG_FASTD_ENABLE_MAC_UHASH),y)
+CMAKE_OPTIONS += -DWITH_MAC_UHASH:BOOL=TRUE
+endif +endif
+ +
define Package/fastd/description ifeq ($(CONFIG_FASTD_WITH_CMDLINE_USER),y)
Fast and secure tunneling daemon, which is optimized on small code size and few dependencies CMAKE_OPTIONS += -DWITH_CMDLINE_USER:BOOL=TRUE
@@ -161,9 +170,9 @@ define Package/fastd/install @@ -143,8 +166,12 @@ 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
+ifeq ($(CONFIG_FASTD_WITH_DYNAMIC_PEERS),y)
+CMAKE_OPTIONS += -DWITH_DYNAMIC_PEERS:BOOL=TRUE
+endif
+
+ifeq ($(CONFIG_FASTD_WITH_STATUS_SOCKET),y)
+CMAKE_OPTIONS += -DWITH_STATUS_SOCKET:BOOL=TRUE
endif
@@ -161,9 +188,9 @@ define Package/fastd/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fastd $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fastd $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/init.d/ $(INSTALL_DIR) $(1)/etc/init.d/