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

starter: Remove starter-specific plugin lists

Browse Source 
It hasn't loaded any plugins since d8fdd1018e ("starter: Don't flush
SAs in the kernel"), which was released with 5.3.3.
This commit is contained in:
Tobias Brunner
2023-02-16 13:25:34 +01:00
parent 68ccb1930c
commit 4e91ff7d8c
4 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
+1 -4
View File
@@ -17,11 +17,8 @@ strongswan_CHARON_PLUGINS := android-log openssl fips-prf random nonce pubkey \
pkcs1 pkcs8 pem xcbc hmac kdf kernel-netlink socket-default android-dns \ pkcs1 pkcs8 pem xcbc hmac kdf kernel-netlink socket-default android-dns \
stroke eap-identity eap-mschapv2 eap-md5 eap-gtc stroke eap-identity eap-mschapv2 eap-md5 eap-gtc
strongswan_STARTER_PLUGINS := kernel-netlink
# list of all plugins - used to enable them with the function below # list of all plugins - used to enable them with the function below
strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS) \ strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS))
$(strongswan_STARTER_PLUGINS))
include $(LOCAL_PATH)/Android.common.mk include $(LOCAL_PATH)/Android.common.mk
configure.ac
+4 -6
View File
@@ -1505,7 +1505,6 @@ m4_include(m4/macros/add-plugin.m4)
# plugin lists for all components # plugin lists for all components
charon_plugins= charon_plugins=
starter_plugins=
pool_plugins= pool_plugins=
attest_plugins= attest_plugins=
pki_plugins= pki_plugins=
@@ -1593,10 +1592,10 @@ ADD_PLUGIN([load-tester], [c charon])
ADD_PLUGIN([kernel-libipsec], [c charon cmd]) ADD_PLUGIN([kernel-libipsec], [c charon cmd])
ADD_PLUGIN([kernel-wfp], [c charon]) ADD_PLUGIN([kernel-wfp], [c charon])
ADD_PLUGIN([kernel-iph], [c charon]) ADD_PLUGIN([kernel-iph], [c charon])
ADD_PLUGIN([kernel-pfkey], [c charon starter nm cmd]) ADD_PLUGIN([kernel-pfkey], [c charon nm cmd])
ADD_PLUGIN([kernel-pfroute], [c charon starter nm cmd]) ADD_PLUGIN([kernel-pfroute], [c charon nm cmd])
ADD_PLUGIN([kernel-netlink], [c charon starter nm cmd]) ADD_PLUGIN([kernel-netlink], [c charon nm cmd])
ADD_PLUGIN([selinux], [c charon starter nm cmd]) ADD_PLUGIN([selinux], [c charon nm cmd])
ADD_PLUGIN([resolve], [c charon cmd]) ADD_PLUGIN([resolve], [c charon cmd])
ADD_PLUGIN([save-keys], [c]) ADD_PLUGIN([save-keys], [c])
ADD_PLUGIN([socket-default], [c charon nm cmd]) ADD_PLUGIN([socket-default], [c charon nm cmd])
@@ -1666,7 +1665,6 @@ ADD_PLUGIN([unity], [c charon])
ADD_PLUGIN([counters], [c charon]) ADD_PLUGIN([counters], [c charon])
AC_SUBST(charon_plugins) AC_SUBST(charon_plugins)
AC_SUBST(starter_plugins)
AC_SUBST(pool_plugins) AC_SUBST(pool_plugins)
AC_SUBST(attest_plugins) AC_SUBST(attest_plugins)
AC_SUBST(pki_plugins) AC_SUBST(pki_plugins)
src/starter/Android.mk
+1 -2
View File
@@ -18,8 +18,7 @@ LOCAL_C_INCLUDES += \
$(strongswan_PATH)/src/stroke $(strongswan_PATH)/src/stroke
LOCAL_CFLAGS := $(strongswan_CFLAGS) \ LOCAL_CFLAGS := $(strongswan_CFLAGS) \
-DIPSEC_SCRIPT='"ipsec"' \ -DIPSEC_SCRIPT='"ipsec"'
-DPLUGINS='"$(strongswan_STARTER_PLUGINS)"'
LOCAL_MODULE := starter LOCAL_MODULE := starter
src/starter/Makefile.am
-1
View File
@@ -24,7 +24,6 @@ AM_CPPFLAGS = \
-DIPSEC_SCRIPT=\"${ipsec_script}\" \ -DIPSEC_SCRIPT=\"${ipsec_script}\" \
-DDEV_RANDOM=\"${random_device}\" \ -DDEV_RANDOM=\"${random_device}\" \
-DDEV_URANDOM=\"${urandom_device}\" \ -DDEV_URANDOM=\"${urandom_device}\" \
-DPLUGINS=\""${starter_plugins}\"" \
-DDEBUG -DDEBUG
AM_CFLAGS = \ AM_CFLAGS = \