starter: Remove starter-specific plugin lists

It hasn't loaded any plugins since d8fdd1018e16 ("starter: Don't flush
SAs in the kernel"), which was released with 5.3.3.

diff --git a/Android.mk b/Android.mk
index c8815fbff6a82ba815f6e05b7d1927a71e58ad31..cdcf2c8b3c979e6c9c94cbd2ad8c3757f3c0fe98 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -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 \
        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
-strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS) \
-       $(strongswan_STARTER_PLUGINS))
+strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS))
 
 include $(LOCAL_PATH)/Android.common.mk
 

diff --git a/configure.ac b/configure.ac
index 7bca05a83273e8242857160a6a5a6623777709ac..a08b0b4922ca336febd5c07caf53c99121d64191 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1505,7 +1505,6 @@ m4_include(m4/macros/add-plugin.m4)
 
 # plugin lists for all components
 charon_plugins=
-starter_plugins=
 pool_plugins=
 attest_plugins=
 pki_plugins=
@@ -1593,10 +1592,10 @@ ADD_PLUGIN([load-tester],          [c charon])
 ADD_PLUGIN([kernel-libipsec],      [c charon cmd])
 ADD_PLUGIN([kernel-wfp],           [c charon])
 ADD_PLUGIN([kernel-iph],           [c charon])
-ADD_PLUGIN([kernel-pfkey],         [c charon starter nm cmd])
-ADD_PLUGIN([kernel-pfroute],       [c charon starter nm cmd])
-ADD_PLUGIN([kernel-netlink],       [c charon starter nm cmd])
-ADD_PLUGIN([selinux],              [c charon starter nm cmd])
+ADD_PLUGIN([kernel-pfkey],         [c charon nm cmd])
+ADD_PLUGIN([kernel-pfroute],       [c charon nm cmd])
+ADD_PLUGIN([kernel-netlink],       [c charon nm cmd])
+ADD_PLUGIN([selinux],              [c charon nm cmd])
 ADD_PLUGIN([resolve],              [c charon cmd])
 ADD_PLUGIN([save-keys],            [c])
 ADD_PLUGIN([socket-default],       [c charon nm cmd])
@@ -1666,7 +1665,6 @@ ADD_PLUGIN([unity],                [c charon])
 ADD_PLUGIN([counters],             [c charon])
 
 AC_SUBST(charon_plugins)
-AC_SUBST(starter_plugins)
 AC_SUBST(pool_plugins)
 AC_SUBST(attest_plugins)
 AC_SUBST(pki_plugins)

diff --git a/src/starter/Android.mk b/src/starter/Android.mk
index a399f6cd2161b5ea8c653a1ad3907fd4440c4c4c..6b76d5977de76907155d9a127a1dea27cd979fa7 100644 (file)
--- a/src/starter/Android.mk
+++ b/src/starter/Android.mk
@@ -18,8 +18,7 @@ LOCAL_C_INCLUDES += \
        $(strongswan_PATH)/src/stroke
 
 LOCAL_CFLAGS := $(strongswan_CFLAGS) \
-       -DIPSEC_SCRIPT='"ipsec"' \
-       -DPLUGINS='"$(strongswan_STARTER_PLUGINS)"'
+       -DIPSEC_SCRIPT='"ipsec"'
 
 LOCAL_MODULE := starter
 

diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index 298a1fb5782776b5f869cbada1f768cbbf0528f9..c098b557250e83d08cdd4703b515eccc777076b2 100644 (file)
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -24,7 +24,6 @@ AM_CPPFLAGS = \
        -DIPSEC_SCRIPT=\"${ipsec_script}\" \
        -DDEV_RANDOM=\"${random_device}\" \
        -DDEV_URANDOM=\"${urandom_device}\" \
-       -DPLUGINS=\""${starter_plugins}\"" \
        -DDEBUG
 
 AM_CFLAGS = \