From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 8 Mar 2010 16:18:47 +0000 (+0100)
Subject: Adding the OpenSSL plugin to the Android build.
X-Git-Tag: 4.4.0~232
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38031382dc1abb3b0f5f5e856e1894f05ad68cd3;p=thirdparty%2Fstrongswan.git

Adding the OpenSSL plugin to the Android build.
---

diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index 47fa457b23..776eeff644 100644
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -100,6 +100,24 @@ LOCAL_SRC_FILES += $(call add_plugin, md5, \
 	md5_plugin.h md5_plugin.c md5_hasher.c md5_hasher.h \
 )
 
+LOCAL_SRC_FILES += $(call add_plugin, openssl, \
+	openssl_plugin.h openssl_plugin.c \
+	openssl_util.c openssl_util.h \
+	openssl_crypter.c openssl_crypter.h \
+	openssl_hasher.c openssl_hasher.h \
+	openssl_sha1_prf.c openssl_sha1_prf.h \
+	openssl_diffie_hellman.c openssl_diffie_hellman.h \
+	openssl_rsa_private_key.c openssl_rsa_private_key.h \
+	openssl_rsa_public_key.c openssl_rsa_public_key.h \
+	openssl_ec_diffie_hellman.c openssl_ec_diffie_hellman.h \
+	openssl_ec_private_key.c openssl_ec_private_key.h \
+	openssl_ec_public_key.c openssl_ec_public_key.h \
+)
+ifneq ($(call plugin_enabled, openssl)),)
+LOCAL_C_INCLUDES += external/openssl/include
+LOCAL_SHARED_LIBRARIES += libcrypto
+endif
+
 LOCAL_SRC_FILES += $(call add_plugin, pem, \
 	pem_plugin.h pem_plugin.c \
 	pem_builder.c pem_builder.h \
diff --git a/src/libstrongswan/utils.c b/src/libstrongswan/utils.c
index fd313843ee..9cff02ab08 100644
--- a/src/libstrongswan/utils.c
+++ b/src/libstrongswan/utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 Tobias Brunner
+ * Copyright (C) 2008-2010 Tobias Brunner
  * Copyright (C) 2005-2008 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
diff --git a/src/libstrongswan/utils.h b/src/libstrongswan/utils.h
index 607d077f7b..04551835e8 100644
--- a/src/libstrongswan/utils.h
+++ b/src/libstrongswan/utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 Tobias Brunner
+ * Copyright (C) 2008-2010 Tobias Brunner
  * Copyright (C) 2008 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *