denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use separate plugin lists for pluto and charon on Android.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-13 18:34:43 +02:00
parent 504c524c13
commit 9227a3b3fa
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk.in
+9 -2
View File
@@ -3,10 +3,18 @@ include $(CLEAR_VARS)
# this is the list of plugins that are built into libstrongswan and charon # this is the list of plugins that are built into libstrongswan and charon
# also these plugins are loaded by default (if not changed in strongswan.conf) # also these plugins are loaded by default (if not changed in strongswan.conf)
strongswan_PLUGINS := openssl fips-prf random pubkey pkcs1 \ strongswan_CHARON_PLUGINS := openssl fips-prf random pubkey pkcs1 \
pem xcbc hmac kernel-netlink socket-default android \ pem xcbc hmac kernel-netlink socket-default android \
stroke eap-identity eap-mschapv2 eap-md5 stroke eap-identity eap-mschapv2 eap-md5
# plugins loaded by pluto
strongswan_PLUTO_PLUGINS := openssl fips-prf random pubkey pkcs1 \
pem xcbc hmac kernel-netlink xauth
# list of all plugins - used to enable them with the function below
strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS) \
$(strongswan_PLUTO_PLUGINS))
# helper macros to only add source files for plugins included in the list above # helper macros to only add source files for plugins included in the list above
# source files are relative to the android.mk that called the macro # source files are relative to the android.mk that called the macro
plugin_enabled = $(findstring $(1), $(strongswan_PLUGINS)) plugin_enabled = $(findstring $(1), $(strongswan_PLUGINS))
@@ -64,7 +72,6 @@ strongswan_CFLAGS := \
-DROUTING_TABLE=0 \ -DROUTING_TABLE=0 \
-DROUTING_TABLE_PRIO=220 \ -DROUTING_TABLE_PRIO=220 \
-DVERSION=\"$(strongswan_VERSION)\" \ -DVERSION=\"$(strongswan_VERSION)\" \
-DPLUGINS='"$(strongswan_PLUGINS)"' \
-DPLUGINDIR=\"$(strongswan_PLUGINDIR)\" \ -DPLUGINDIR=\"$(strongswan_PLUGINDIR)\" \
-DIPSEC_DIR=\"$(strongswan_DIR)\" \ -DIPSEC_DIR=\"$(strongswan_DIR)\" \
-DIPSEC_PIDDIR=\"$(strongswan_PIDDIR)\" \ -DIPSEC_PIDDIR=\"$(strongswan_PIDDIR)\" \
src/libcharon/Android.mk
+2 -1
View File
@@ -162,7 +162,8 @@ LOCAL_C_INCLUDES += \
$(strongswan_PATH)/src/libstrongswan \ $(strongswan_PATH)/src/libstrongswan \
$(strongswan_PATH)/src/libtncif $(strongswan_PATH)/src/libtncif
LOCAL_CFLAGS := $(strongswan_CFLAGS) LOCAL_CFLAGS := $(strongswan_CFLAGS) \
-DPLUGINS='"$(strongswan_CHARON_PLUGINS)"'
LOCAL_MODULE := libcharon LOCAL_MODULE := libcharon
src/pluto/Android.mk
+2 -1
View File
@@ -62,7 +62,8 @@ LOCAL_C_INCLUDES += \
LOCAL_CFLAGS := $(strongswan_CFLAGS) \ LOCAL_CFLAGS := $(strongswan_CFLAGS) \
-DPLUTO -DVENDORID -DXAUTH_VID -DCISCO_QUIRKS \ -DPLUTO -DVENDORID -DXAUTH_VID -DCISCO_QUIRKS \
-DTHREADS -DKERNEL26_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES -DTHREADS -DKERNEL26_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES \
-DPLUGINS='"$(strongswan_PLUTO_PLUGINS)"'
LOCAL_MODULE := pluto LOCAL_MODULE := pluto