From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 10 Feb 2023 09:36:50 +0000 (+0100)
Subject: android: Clean up plugin list after switching to OpenSSL
X-Git-Tag: android-2.4.0^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=937f7261547352369bcf6616808b72aacd2b1cc9;p=thirdparty%2Fstrongswan.git

android: Clean up plugin list after switching to OpenSSL

Keep the kdf plugin because of AES-XCBC (and CAMELLIA-XCBC, which is now
supported due to OpenSSL).  Other plugins like fips-prf, pubkey or pkcs8
were never actually used by the app.  The random plugin might have been
necessary with early versions.
---

diff --git a/src/frontends/android/app/src/main/jni/Android.mk b/src/frontends/android/app/src/main/jni/Android.mk
index dcfe5f7803..06cddaa773 100644
--- a/src/frontends/android/app/src/main/jni/Android.mk
+++ b/src/frontends/android/app/src/main/jni/Android.mk
@@ -5,9 +5,9 @@ include $(CLEAR_VARS)
 # MainActivity.java)
 strongswan_USE_BYOD := true
 
-strongswan_CHARON_PLUGINS := android-log openssl fips-prf random nonce pubkey \
-	chapoly curve25519 pkcs1 pkcs8 pem xcbc hmac kdf socket-default revocation \
-	eap-identity eap-mschapv2 eap-md5 eap-gtc eap-tls x509
+strongswan_CHARON_PLUGINS := android-log socket-default openssl nonce \
+	pkcs1 pem x509 xcbc kdf revocation \
+	eap-identity eap-mschapv2 eap-md5 eap-gtc eap-tls
 
 ifneq ($(strongswan_USE_BYOD),)
 strongswan_BYOD_PLUGINS := eap-ttls eap-tnc tnc-imc tnc-tnccs tnccs-20