From: Martin Willi <martin@revosec.ch>
Date: Wed, 31 Jul 2013 09:38:18 +0000 (+0200)
Subject: charon-xpc: use kernel-libipsec instead of kernel-pfkey
X-Git-Tag: 5.1.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aafb6fa6c2566216fcfe4d2e5e85cf78ea1b889c;p=thirdparty%2Fstrongswan.git

charon-xpc: use kernel-libipsec instead of kernel-pfkey
---

diff --git a/src/frontends/osx/README.md b/src/frontends/osx/README.md
index 66799b8447..2e97fea213 100644
--- a/src/frontends/osx/README.md
+++ b/src/frontends/osx/README.md
@@ -26,10 +26,11 @@ a monolithic and static build. This can be achieved on OS X by using:
     CFLAGS="-idirafter /opt/local/include -O2 -Wall -Wno-format -Wno-pointer-sign" \
     ./configure --enable-monolithic --disable-shared --enable-static \
         --disable-defaults \
-        --enable-openssl --enable-kernel-pfkey --enable-kernel-pfroute \
+        --enable-openssl --enable-kernel-libipsec --enable-kernel-pfroute \
         --enable-eap-mschapv2 --enable-eap-identity --enable-nonce \
-        --enable-random --enable-pkcs1 --enable-pem --enable-socket-default \
-        --enable-xauth-generic --enable-keychain --enable-charon \
+        --enable-pkcs1 --enable-socket-default --enable-osx-attr \
+        --enable-xauth-generic --enable-gcm --enable-ccm --enable-ctr \
+        --enable-keychain --enable-charon \
         --enable-ikev1 --enable-ikev2
 
 followed by calling make (no need to make install).
diff --git a/src/frontends/osx/charon-xpc/charon-xpc.c b/src/frontends/osx/charon-xpc/charon-xpc.c
index 94fef67602..1c797b805e 100644
--- a/src/frontends/osx/charon-xpc/charon-xpc.c
+++ b/src/frontends/osx/charon-xpc/charon-xpc.c
@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
 								"charon-xpc.close_ike_on_child_failure", "yes");
 	if (!charon->initialize(charon,
 			lib->settings->get_str(lib->settings, "charon-xpc.load",
-				"random nonce pem pkcs1 openssl kernel-pfkey kernel-pfroute "
+				"nonce pkcs1 openssl kernel-libipsec kernel-pfroute "
 				"keychain socket-default eap-identity eap-mschapv2 osx-attr")))
 	{
 		exit(SS_RC_INITIALIZATION_FAILED);
diff --git a/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj b/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
index 2eb88b77ac..61f6329807 100644
--- a/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
+++ b/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
@@ -236,6 +236,8 @@
 					"-force_load",
 					../../libstrongswan/.libs/libstrongswan.a,
 					"-force_load",
+					../../libipsec/.libs/libipsec.a,
+					"-force_load",
 					../../libhydra/.libs/libhydra.a,
 					"-force_load",
 					../../libcharon/.libs/libcharon.a,
@@ -288,6 +290,8 @@
 					"-force_load",
 					../../libstrongswan/.libs/libstrongswan.a,
 					"-force_load",
+					../../libipsec/.libs/libipsec.a,
+					"-force_load",
 					../../libhydra/.libs/libhydra.a,
 					"-force_load",
 					../../libcharon/.libs/libcharon.a,