From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 22 Jun 2012 11:32:07 +0000 (+0200)
Subject: Build nonce plugin on Android
X-Git-Tag: 5.0.0~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43d01ab2f6711b495c2e01c213e898f7ceee84c1;p=thirdparty%2Fstrongswan.git

Build nonce plugin on Android
---

diff --git a/Android.mk.in b/Android.mk.in
index 40abc846c7..d179cac59b 100644
--- a/Android.mk.in
+++ b/Android.mk.in
@@ -16,7 +16,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 := openssl fips-prf random pubkey pkcs1 \
+strongswan_CHARON_PLUGINS := openssl fips-prf random nonce pubkey pkcs1 \
 	pem xcbc hmac kernel-netlink socket-default android \
 	stroke eap-identity eap-mschapv2 eap-md5
 
diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index a41a1a26d4..e3640c62a1 100644
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -20,6 +20,7 @@ crypto/pkcs9.c crypto/pkcs9.h \
 crypto/proposal/proposal_keywords.c crypto/proposal/proposal_keywords.h \
 crypto/prfs/prf.c crypto/prfs/prf.h \
 crypto/rngs/rng.c crypto/rngs/rng.h \
+crypto/nonce_gen.h \
 crypto/prf_plus.h crypto/prf_plus.c \
 crypto/signers/signer.c crypto/signers/signer.h \
 crypto/crypto_factory.c crypto/crypto_factory.h \
@@ -102,6 +103,8 @@ LOCAL_SRC_FILES += $(call add_plugin, md4)
 
 LOCAL_SRC_FILES += $(call add_plugin, md5)
 
+LOCAL_SRC_FILES += $(call add_plugin, nonce)
+
 LOCAL_SRC_FILES += $(call add_plugin, openssl)
 ifneq ($(call plugin_enabled, openssl),)
 LOCAL_C_INCLUDES += external/openssl/include