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

diff --git a/src/frontends/osx/README.md b/src/frontends/osx/README.md
index 66799b8447d7c3de26a739cbbf23c1dc7d0693d7..2e97fea213a83548403ab96fc6f7568cc463536f 100644 (file)
--- 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 94fef676025b2a98293eb9d0da2a8232419d3a1b..1c797b805eadf113149a0c7fa50ed6a71d02b3df 100644 (file)
--- 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 2eb88b77ac0f5dd8c11eb8c8e79d864128001d25..61f63298077799f2d55b2ae9ac2d142de58ffc72 100644 (file)
--- 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,