From 7e7dd100ab448590c5582249efc76d0d447a6428 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 21 Sep 2012 17:17:00 +0200
Subject: [PATCH] Update fastd to v0.5

---
 net/fastd/Config.in | 32 ++++++++++++++++++----
 net/fastd/Makefile  | 67 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/net/fastd/Config.in b/net/fastd/Config.in
index e12705b..93d4375 100644
--- a/net/fastd/Config.in
+++ b/net/fastd/Config.in
@@ -1,14 +1,34 @@
 menu "Configuration"
 	depends on PACKAGE_fastd
 
-config FASTD_DISABLE_METHOD_XSALSA20_POLY1305
-	bool "Disable xsalsa20-poly1305 method"
+config FASTD_ENABLE_METHOD_XSALSA20_POLY1305
+	bool "Enable xsalsa20-poly1305 method"
 	depends on PACKAGE_fastd
-	default n
+	default y
 
-config FASTD_DISABLE_METHOD_AES128_GCM
-	bool "Disable aes128-gcm method"
+config FASTD_ENABLE_METHOD_AES128_GCM
+	bool "Enable aes128-gcm method"
+	depends on PACKAGE_fastd && (FASTD_ENABLE_CRYPTO_AES128CTR_NACL || FASTD_ENABLE_CRYPTO_AES128CTR_LINUX) && (FASTD_ENABLE_CRYPTO_GHASH_BUILTIN || FASTD_ENABLE_CRYPTO_GHASH_LINUX)
+	default y
+
+config FASTD_ENABLE_CRYPTO_AES128CTR_NACL
+	bool "Include the AES128-CTR implementation from the NaCl library"
 	depends on PACKAGE_fastd
-	default n
+	default y
+
+config FASTD_ENABLE_CRYPTO_AES128CTR_LINUX
+	bool "Support using the AES128-CTR implementation in the Linux kernel"
+	depends on PACKAGE_fastd
+	default y
+
+config FASTD_ENABLE_CRYPTO_GHASH_BUILTIN
+	bool "Include the built-in GHASH implementation"
+	depends on PACKAGE_fastd
+	default y
+
+config FASTD_ENABLE_CRYPTO_GHASH_LINUX
+	bool "Support using the GHASH implementation in the Linux kernel"
+	depends on PACKAGE_fastd
+	default y
 
 endmenu
diff --git a/net/fastd/Makefile b/net/fastd/Makefile
index d218401..e69cf09 100644
--- a/net/fastd/Makefile
+++ b/net/fastd/Makefile
@@ -8,14 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fastd
-PKG_VERSION:=0.5-rc4
+PKG_VERSION:=0.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/34
-PKG_MD5SUM:=f341811a69146e1befc14a7920781511
+PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/35
+PKG_MD5SUM:=f7cc6fdddf52aab2b3f582d22159de4f
 
-PKG_CONFIG_DEPENDS:=CONFIG_FASTD_DISABLE_METHOD_XSALSA20_POLY1305 CONFIG_FASTD_DISABLE_METHOD_AES128_GCM
+PKG_CONFIG_DEPENDS:=\
+	CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305 \
+	CONFIG_FASTD_ENABLE_METHOD_AES128_GCM \
+	CONFIG_FASTD_ENABLE_CRYPTO_AES128CTR_NACL \
+	CONFIG_FASTD_ENABLE_CRYPTO_AES128CTR_LINUX \
+	CONFIG_FASTD_ENABLE_CRYPTO_GHASH_BUILTIN \
+	CONFIG_FASTD_ENABLE_CRYPTO_GHASH_LINUX \
 PKG_BUILD_DEPENDS:=nacl libuecc
 
 include $(INCLUDE_DIR)/package.mk
@@ -38,22 +44,55 @@ CMAKE_OPTIONS += \
 	-DCMAKE_BUILD_TYPE:String="MINSIZEREL" \
 
 
-ifeq ($(CONFIG_FASTD_DISABLE_METHOD_XSALSA20_POLY1305),y)
-CMAKE_OPTIONS += \
-	-DWITH_METHOD_XSALSA20_POLY1305:BOOL=FALSE
-else
+ifeq ($(CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305),y)
 CMAKE_OPTIONS += \
 	-DWITH_METHOD_XSALSA20_POLY1305:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_DISABLE_METHOD_AES128_GCM),y)
-CMAKE_OPTIONS += \
-	-DWITH_METHOD_AES128_GCM:BOOL=FALSE
 else
 CMAKE_OPTIONS += \
-	-DWITH_METHOD_AES128_GCM:BOOL=TRUE
+	-DWITH_METHOD_XSALSA20_POLY1305:BOOL=FALSE
 endif
 
+ifeq ($(CONFIG_FASTD_ENABLE_METHOD_AES128_GCM),y)
+CMAKE_OPTIONS += \
+	-DWITH_METHOD_AES128_GCM:BOOL=TRUE
+else
+CMAKE_OPTIONS += \
+	-DWITH_METHOD_AES128_GCM:BOOL=FALSE
+endif
+
+ifeq ($(CONFIG_FASTD_ENABLE_CRYPTO_AES128CTR_NACL),y)
+CMAKE_OPTIONS += \
+	-DWITH_CRYPTO_AES128CTR_NACL:BOOL=TRUE
+else
+CMAKE_OPTIONS += \
+	-DWITH_CRYPTO_AES128CTR_NACL:BOOL=FALSE
+endif
+
+ifeq ($(CONFIG_FASTD_ENABLE_CRYPTO_AES128CTR_LINUX),y)
+CMAKE_OPTIONS += \
+	-DWITH_CRYPTO_AES128CTR_LINUX:BOOL=TRUE
+else
+CMAKE_OPTIONS += \
+	-DWITH_CRYPTO_AES128CTR_LINUX:BOOL=FALSE
+endif
+
+ifeq ($(CONFIG_FASTD_ENABLE_CRYPTO_GHASH_BUILTIN),y)
+CMAKE_OPTIONS += \
+	-DWITH_CRYPTO_GHASH_BUILTIN:BOOL=TRUE
+else
+CMAKE_OPTIONS += \
+	-DWITH_CRYPTO_GHASH_BUILTIN:BOOL=FALSE
+endif
+
+ifeq ($(CONFIG_FASTD_ENABLE_CRYPTO_GHASH_LINUX),y)
+CMAKE_OPTIONS += \
+	-DWITH_CRYPTO_GHASH_LINUX:BOOL=TRUE
+else
+CMAKE_OPTIONS += \
+	-DWITH_CRYPTO_GHASH_LINUX:BOOL=FALSE
+endif
+
+
 define Package/fastd/description
  Fast and secure tunneling daemon, which is optimized on small code size and few dependencies
 endef