From 69f731a9d8d94d755851ed624cadd45e822aae70 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 28 Aug 2012 16:45:46 +0200 Subject: [PATCH] android: Enable pkcs8 plugin --- Android.mk | 2 +- src/frontends/android/jni/Android.mk | 2 +- src/libstrongswan/Android.mk | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index ad7093d947..663b363cfd 100644 --- 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 pem xcbc hmac kernel-netlink socket-default android \ + pkcs1 pkcs8 pem xcbc hmac kernel-netlink socket-default android \ stroke eap-identity eap-mschapv2 eap-md5 eap-gtc ifneq ($(strongswan_BUILD_SCEPCLIENT),) diff --git a/src/frontends/android/jni/Android.mk b/src/frontends/android/jni/Android.mk index a603a733ef..326565f2bb 100644 --- a/src/frontends/android/jni/Android.mk +++ b/src/frontends/android/jni/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) strongswan_CHARON_PLUGINS := android-log openssl fips-prf random nonce pubkey \ - pkcs1 pem xcbc hmac socket-default \ + pkcs1 pkcs8 pem xcbc hmac socket-default \ eap-identity eap-mschapv2 eap-md5 eap-gtc strongswan_PLUGINS := $(strongswan_CHARON_PLUGINS) diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk index 3b2d7eaaac..9125079a4a 100644 --- a/src/libstrongswan/Android.mk +++ b/src/libstrongswan/Android.mk @@ -67,6 +67,8 @@ LOCAL_SRC_FILES += $(call add_plugin, pem) LOCAL_SRC_FILES += $(call add_plugin, pkcs1) +LOCAL_SRC_FILES += $(call add_plugin, pkcs8) + LOCAL_SRC_FILES += $(call add_plugin, pkcs11) LOCAL_SRC_FILES += $(call add_plugin, pubkey) -- 2.47.3