android: Build and load kdf plugin for prf+

Not necessary with newer versions of OpenSSL, but our BoringSSL release
does not support HKDF yet.

diff --git a/Android.mk b/Android.mk
index 69869dfe6300a359683ef1071bfbb44b172973f7..a69599598fef3738c673222887084574977620d8 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,7 @@ include $(CLEAR_VARS)
 # 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)
 strongswan_CHARON_PLUGINS := android-log openssl fips-prf random nonce pubkey \
-       pkcs1 pkcs8 pem xcbc hmac 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
 
 ifneq ($(strongswan_BUILD_SCEPCLIENT),)

diff --git a/src/frontends/android/app/src/main/jni/Android.mk b/src/frontends/android/app/src/main/jni/Android.mk
index 54c4bb947e4bac39eb0f7b4549cfcf1ccedb7dc1..dcfe5f7803d85e7b8463d3560216f2429b468910 100644 (file)
--- a/src/frontends/android/app/src/main/jni/Android.mk
+++ b/src/frontends/android/app/src/main/jni/Android.mk
@@ -6,7 +6,7 @@ include $(CLEAR_VARS)
 strongswan_USE_BYOD := true
 
 strongswan_CHARON_PLUGINS := android-log openssl fips-prf random nonce pubkey \
-       chapoly curve25519 pkcs1 pkcs8 pem xcbc hmac socket-default revocation \
+       chapoly curve25519 pkcs1 pkcs8 pem xcbc hmac kdf socket-default revocation \
        eap-identity eap-mschapv2 eap-md5 eap-gtc eap-tls x509
 
 ifneq ($(strongswan_USE_BYOD),)