From 458fe1ef88671dfe580c488973d5573194839087 Mon Sep 17 00:00:00 2001
From: Chia-chi Yeh <chiachi@android.com>
Date: Fri, 26 Jun 2009 14:36:17 +0800
Subject: ipsec-tools: Integrate racoon with Android framework.

---
 src/racoon/crypto_openssl.c | 5 +++++
 src/racoon/isakmp.c         | 3 +++
 src/racoon/pfkey.c          | 2 ++
 3 files changed, 10 insertions(+)

(limited to 'src')

diff --git a/src/racoon/crypto_openssl.c b/src/racoon/crypto_openssl.c
index 41c4931..f281c29 100644
--- a/src/racoon/crypto_openssl.c
+++ b/src/racoon/crypto_openssl.c
@@ -63,8 +63,13 @@
 #ifdef HAVE_OPENSSL_ENGINE_H
 #include <openssl/engine.h>
 #endif
+#ifndef ANDROID_CHANGES
 #include <openssl/blowfish.h>
 #include <openssl/cast.h>
+#else
+#define EVP_bf_cbc()    NULL
+#define EVP_cast5_cbc() NULL
+#endif
 #include <openssl/err.h>
 #ifdef HAVE_OPENSSL_RC5_H
 #include <openssl/rc5.h>
diff --git a/src/racoon/isakmp.c b/src/racoon/isakmp.c
index 83741fc..12eb5a0 100644
--- a/src/racoon/isakmp.c
+++ b/src/racoon/isakmp.c
@@ -116,6 +116,9 @@
 #  ifndef SOL_UDP
 #   define SOL_UDP 17
 #  endif
+#ifdef ANDROID_CHANGES
+#define __linux
+#endif
 # endif /* __linux__ */
 # if defined(__NetBSD__) || defined(__FreeBSD__) ||	\
   (defined(__APPLE__) && defined(__MACH__))
diff --git a/src/racoon/pfkey.c b/src/racoon/pfkey.c
index cefd161..cbbf042 100644
--- a/src/racoon/pfkey.c
+++ b/src/racoon/pfkey.c
@@ -59,7 +59,9 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
+#ifndef ANDROID_CHANGES
 #include <sys/sysctl.h>
+#endif
 
 #include <net/route.h>
 #include <net/pfkeyv2.h>
-- 
cgit v1.2.3