kissbac
/
packages
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

fastd: update configuration options 

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>
Matthias Schiffer 10 years ago
parent
c55ce0bdfd
commit
6cafaf4cf8
2 changed files with 39 additions and 6 deletions
Split View Show Diff Stats
  1. 16
    1
      net/fastd/Config.in
  2. 23
    5
      net/fastd/Makefile

+ 16
- 1
net/fastd/Config.in View File 

@@ -11,6 +11,11 @@ config FASTD_ENABLE_METHOD_COMPOSED_GMAC
11 11 
 	depends on PACKAGE_fastd
12 12 
 	default y
13 13
14 
+config FASTD_ENABLE_METHOD_COMPOSED_UMAC
15 
+	bool "Enable composed-umac method provider"
16 
+	depends on PACKAGE_fastd
17 
+	default y
18 
+
14 19 
 config FASTD_ENABLE_METHOD_GENERIC_GMAC
15 20 
 	bool "Enable generic-gmac method provider"
16 21 
 	depends on PACKAGE_fastd
 
@@ -21,6 +26,11 @@ config FASTD_ENABLE_METHOD_GENERIC_POLY1305
21 26 
 	depends on PACKAGE_fastd
22 27 
 	default n
23 28
29 
+config FASTD_ENABLE_METHOD_GENERIC_UMAC
30 
+	bool "Enable generic-umac method provider"
31 
+	depends on PACKAGE_fastd
32 
+	default y
33 
+
24 34 
 config FASTD_ENABLE_METHOD_NULL
25 35 
 	bool "Enable null method"
26 36 
 	depends on PACKAGE_fastd
 
@@ -58,6 +68,11 @@ config FASTD_ENABLE_MAC_GHASH
58 68 
 	depends on PACKAGE_fastd
59 69 
 	default y
60 70
71 
+config FASTD_ENABLE_MAC_UHASH
72 
+	bool "Enable the UHASH message authentication code"
73 
+	depends on PACKAGE_fastd
74 
+	default y
75 
+
61 76
62 77 
 config FASTD_WITH_CMDLINE_USER
63 78 
 	bool "Include support for setting user/group related options on the command line"
 
@@ -79,7 +94,7 @@ config FASTD_WITH_CMDLINE_COMMANDS
79 94 
 	depends on PACKAGE_fastd
80 95 
 	default n
81 96
82 
-config FASTD_WITH_VERIFY
97 
+config FASTD_WITH_DYNAMIC_PEERS
83 98 
 	bool "Include support for on-verify handlers"
84 99 
 	depends on PACKAGE_fastd
85 100 
 	default n

+ 23
- 5
net/fastd/Makefile View File 

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
9 9
10 10 
 PKG_NAME:=fastd
11 11 
 PKG_VERSION:=16
12 
-PKG_RELEASE:=1
12 
+PKG_RELEASE:=2
13 13
14 14 
 PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
15 15 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 
@@ -22,8 +22,10 @@ PKG_LICENSE_FILES:=COPYRIGHT
22 22 
 PKG_CONFIG_DEPENDS:=\
23 23 
 	CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
24 24 
 	CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC \
25 
+	CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC \
25 26 
 	CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC \
26 27 
 	CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305 \
28 
+	CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC \
27 29 
 	CONFIG_FASTD_ENABLE_METHOD_NULL \
28 30 
 	CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305 \
29 31 
 	CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR \
 
@@ -31,11 +33,12 @@ PKG_CONFIG_DEPENDS:=\
31 33 
 	CONFIG_FASTD_ENABLE_CIPHER_SALSA20 \
32 34 
 	CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 \
33 35 
 	CONFIG_FASTD_ENABLE_MAC_GHASH \
36 
+	CONFIG_FASTD_ENABLE_MAC_UHASH \
34 37 
 	CONFIG_FASTD_WITH_CMDLINE_USER \
35 38 
 	CONFIG_FASTD_WITH_CMDLINE_LOGGING \
36 39 
 	CONFIG_FASTD_WITH_CMDLINE_OPERATION \
37 40 
 	CONFIG_FASTD_WITH_CMDLINE_COMMANDS \
38 
-	CONFIG_FASTD_WITH_VERIFY \
41 
+	CONFIG_FASTD_WITH_DYNAMIC_PEERS \
39 42 
 	CONFIG_FASTD_WITH_STATUS_SOCKET
40 43
41 44 
 
@@ -64,8 +67,10 @@ CMAKE_OPTIONS += \
64 67 
 	-DCMAKE_BUILD_TYPE:STRING=MINSIZEREL \
65 68 
 	-DWITH_METHOD_CIPHER_TEST:BOOL=FALSE \
66 69 
 	-DWITH_METHOD_COMPOSED_GMAC:BOOL=FALSE \
70 
+	-DWITH_METHOD_COMPOSED_UMAC:BOOL=FALSE \
67 71 
 	-DWITH_METHOD_GENERIC_GMAC:BOOL=FALSE \
68 72 
 	-DWITH_METHOD_GENERIC_POLY1305:BOOL=FALSE \
73 
+	-DWITH_METHOD_GENERIC_UMAC:BOOL=FALSE \
69 74 
 	-DWITH_METHOD_NULL:BOOL=FALSE \
70 75 
 	-DWITH_METHOD_XSALSA20_POLY1305:BOOL=FALSE \
71 76 
 	-DWITH_CIPHER_AES128_CTR:BOOL=FALSE \
 
@@ -73,11 +78,12 @@ CMAKE_OPTIONS += \
73 78 
 	-DWITH_CIPHER_SALSA20:BOOL=FALSE \
74 79 
 	-DWITH_CIPHER_SALSA2012:BOOL=FALSE \
75 80 
 	-DWITH_MAC_GHASH:BOOL=FALSE \
81 
+	-DWITH_MAC_UHASH:BOOL=FALSE \
76 82 
 	-DWITH_CMDLINE_USER:BOOL=FALSE \
77 83 
 	-DWITH_CMDLINE_LOGGING:BOOL=FALSE \
78 84 
 	-DWITH_CMDLINE_OPERATION:BOOL=FALSE \
79 85 
 	-DWITH_CMDLINE_COMMANDS:BOOL=FALSE \
80 
-	-DWITH_VERIFY:BOOL=FALSE \
86 
+	-DWITH_DYNAMIC_PEERS:BOOL=FALSE \
81 87 
 	-DWITH_STATUS_SOCKET:BOOL=FALSE \
82 88 
 	-DWITH_CAPABILITIES:BOOL=FALSE \
83 89 
 	-DENABLE_SYSTEMD:BOOL=FALSE \
 
@@ -93,6 +99,10 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC),y)
93 99 
 CMAKE_OPTIONS += -DWITH_METHOD_COMPOSED_GMAC:BOOL=TRUE
94 100 
 endif
95 101
102 
+ifeq ($(CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC),y)
103 
+CMAKE_OPTIONS += -DWITH_METHOD_COMPOSED_UMAC:BOOL=TRUE
104 
+endif
105 
+
96 106 
 ifeq ($(CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC),y)
97 107 
 CMAKE_OPTIONS += -DWITH_METHOD_GENERIC_GMAC:BOOL=TRUE
98 108 
 endif
 
@@ -101,6 +111,10 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305),y)
101 111 
 CMAKE_OPTIONS += -DWITH_METHOD_GENERIC_POLY1305:BOOL=TRUE
102 112 
 endif
103 113
114 
+ifeq ($(CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC),y)
115 
+CMAKE_OPTIONS += -DWITH_METHOD_GENERIC_UMAC:BOOL=TRUE
116 
+endif
117 
+
104 118 
 ifeq ($(CONFIG_FASTD_ENABLE_METHOD_NULL),y)
105 119 
 CMAKE_OPTIONS += -DWITH_METHOD_NULL:BOOL=TRUE
106 120 
 endif
 
@@ -131,6 +145,10 @@ ifeq ($(CONFIG_FASTD_ENABLE_MAC_GHASH),y)
131 145 
 CMAKE_OPTIONS += -DWITH_MAC_GHASH:BOOL=TRUE
132 146 
 endif
133 147
148 
+ifeq ($(CONFIG_FASTD_ENABLE_MAC_UHASH),y)
149 
+CMAKE_OPTIONS += -DWITH_MAC_UHASH:BOOL=TRUE
150 
+endif
151 
+
134 152
135 153 
 ifeq ($(CONFIG_FASTD_WITH_CMDLINE_USER),y)
136 154 
 CMAKE_OPTIONS += -DWITH_CMDLINE_USER:BOOL=TRUE
 
@@ -148,8 +166,8 @@ ifeq ($(CONFIG_FASTD_WITH_CMDLINE_COMMANDS),y)
148 166 
 CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE
149 167 
 endif
150 168
151 
-ifeq ($(CONFIG_FASTD_WITH_VERIFY),y)
152 
-CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE
169 
+ifeq ($(CONFIG_FASTD_WITH_DYNAMIC_PEERS),y)
170 
+CMAKE_OPTIONS += -DWITH_DYNAMIC_PEERS:BOOL=TRUE
153 171 
 endif
154 172
155 173 
 ifeq ($(CONFIG_FASTD_WITH_STATUS_SOCKET),y)