Build nonce plugin on Android

diff --git a/Android.mk.in b/Android.mk.in
index 40abc846c7dcdb11ef6fa4960ee737b00553b004..d179cac59b5a77f2b0a36924fdd6d8ca922fdc7a 100644 (file)
--- 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 a41a1a26d485028a56cf99f57d6e37b800b3ef45..e3640c62a138539c0f212e92f9b95aa36340981d 100644 (file)
--- 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