openwrt/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-04-15 10:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fastd: update configuration options

Browse Source 
When updating fastd, some added and renamed CMake options had been forgotten, so
it was impossible to disable some feature to reduce its size.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer
2015-01-08 01:12:07 +01:00
parent c55ce0bdfd
commit 6cafaf4cf8
2 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
net/fastd/Config.in
View File

@@ -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
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,7 +94,7 @@ config FASTD_WITH_CMDLINE_COMMANDS
depends on PACKAGE_fastd
default n
config FASTD_WITH_VERIFY
config FASTD_WITH_DYNAMIC_PEERS
bool "Include support for on-verify handlers"
depends on PACKAGE_fastd
default n

28
net/fastd/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=fastd
PKG_VERSION:=16
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -22,8 +22,10 @@ PKG_LICENSE_FILES:=COPYRIGHT
PKG_CONFIG_DEPENDS:=\
CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
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 \
@@ -31,11 +33,12 @@ 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_OPERATION \
CONFIG_FASTD_WITH_CMDLINE_COMMANDS \
CONFIG_FASTD_WITH_VERIFY \
CONFIG_FASTD_WITH_DYNAMIC_PEERS \
CONFIG_FASTD_WITH_STATUS_SOCKET
@@ -64,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 \
@@ -73,11 +78,12 @@ 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_COMMANDS:BOOL=FALSE \
-DWITH_VERIFY:BOOL=FALSE \
-DWITH_DYNAMIC_PEERS:BOOL=FALSE \
-DWITH_STATUS_SOCKET:BOOL=FALSE \
-DWITH_CAPABILITIES:BOOL=FALSE \
-DENABLE_SYSTEMD:BOOL=FALSE \
@@ -93,6 +99,10 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC),y)
CMAKE_OPTIONS += -DWITH_METHOD_COMPOSED_GMAC:BOOL=TRUE
endif
ifeq ($(CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC),y)
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
@@ -101,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
@@ -131,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
ifeq ($(CONFIG_FASTD_WITH_CMDLINE_USER),y)
CMAKE_OPTIONS += -DWITH_CMDLINE_USER:BOOL=TRUE
@@ -148,8 +166,8 @@ 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)