]> git.saurik.com Git - apple/ipsec.git/blobdiff - ipsec.xcodeproj/project.pbxproj
projects / apple / ipsec.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ipsec-317.tar.gz
[apple/ipsec.git] / ipsec.xcodeproj / project.pbxproj
diff --git a/ipsec.xcodeproj/project.pbxproj b/ipsec.xcodeproj/project.pbxproj
index 3243a0c846cd1112e55488a278a95741a14a6e21..140c9cf89b4b10783ad5d22b2b709137b7ba8e61 100644 (file)
--- a/ipsec.xcodeproj/project.pbxproj
+++ b/ipsec.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
        archiveVersion = 1;
        classes = {
        };
        archiveVersion = 1;
        classes = {
        };
-       objectVersion = 45;
+       objectVersion = 46;
        objects = {
 
 /* Begin PBXAggregateTarget section */
        objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -11,53 +11,78 @@
                        isa = PBXAggregateTarget;
                        buildConfigurationList = 25D3DAB8098952B20025F703 /* Build configuration list for PBXAggregateTarget "IPSec (Aggregate)" */;
                        buildPhases = (
                        isa = PBXAggregateTarget;
                        buildConfigurationList = 25D3DAB8098952B20025F703 /* Build configuration list for PBXAggregateTarget "IPSec (Aggregate)" */;
                        buildPhases = (
+                               BAA6806112B17CF900ACF6D3 /* CopyFiles */,
+                               72265DD80F818ED700730A7D /* CopyFiles */,
                        );
                        dependencies = (
                        );
                        dependencies = (
-                               815C35FB152520C000502220 /* PBXTargetDependency */,
-                               815C35F9152520BC00502220 /* PBXTargetDependency */,
+                               724ED876168515A7008F2EBD /* PBXTargetDependency */,
+                               72B3C21916850CC5004E4548 /* PBXTargetDependency */,
                        );
                        name = "IPSec (Aggregate)";
                        productName = "IPSec (Aggregate)";
                };
                        );
                        name = "IPSec (Aggregate)";
                        productName = "IPSec (Aggregate)";
                };
-               812530AA0D3FE994006BDF4F /* IPSec Embedded (Aggregate) */ = {
+               72B3C2081684F5C4004E4548 /* ipsec_executables */ = {
                        isa = PBXAggregateTarget;
                        isa = PBXAggregateTarget;
-                       buildConfigurationList = 812530B50D3FE994006BDF4F /* Build configuration list for PBXAggregateTarget "IPSec Embedded (Aggregate)" */;
+                       buildConfigurationList = 72B3C20C1684F5C4004E4548 /* Build configuration list for PBXAggregateTarget "ipsec_executables" */;
                        buildPhases = (
                        buildPhases = (
+                               72B3C21C16850D02004E4548 /* CopyFiles */,
+                               72B3C21E16850D1E004E4548 /* CopyFiles */,
                        );
                        dependencies = (
                        );
                        dependencies = (
-                               812531110D3FEA28006BDF4F /* PBXTargetDependency */,
-                               81DDFDD90D622C4E00C5CB87 /* PBXTargetDependency */,
-                               8125312C0D3FEA44006BDF4F /* PBXTargetDependency */,
-                               81DDFDF10D627DE300C5CB87 /* PBXTargetDependency */,
+                               69983DBD1E7B3D30007683BF /* PBXTargetDependency */,
+                               72B3C2101684F5E1004E4548 /* PBXTargetDependency */,
+                               72B3C20E1684F5DE004E4548 /* PBXTargetDependency */,
                        );
                        );
-                       name = "IPSec Embedded (Aggregate)";
-                       productName = "IPSec (Aggregate) Embedded";
+                       name = ipsec_executables;
+                       productName = ipsec_executables;
+               };
+               72B3C21116850B87004E4548 /* ipsec_libraries */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = 72B3C21216850B87004E4548 /* Build configuration list for PBXAggregateTarget "ipsec_libraries" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               72B3C21716850BA0004E4548 /* PBXTargetDependency */,
+                       );
+                       name = ipsec_libraries;
+                       productName = ipsec_libraries;
+               };
+               78C83A04189841E800DB2F64 /* ipsec_libraries_embedded */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = 78C83A08189841E800DB2F64 /* Build configuration list for PBXAggregateTarget "ipsec_libraries_embedded" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               78C83A131898421900DB2F64 /* PBXTargetDependency */,
+                       );
+                       name = ipsec_libraries_embedded;
+                       productName = ipsec_libraries_embedded;
                };
                };
-               815C35E61525201900502220 /* Project_base */ = {
+               78C83A09189841FA00DB2F64 /* ipsec_executables_embedded */ = {
                        isa = PBXAggregateTarget;
                        isa = PBXAggregateTarget;
-                       buildConfigurationList = 815C35E71525201900502220 /* Build configuration list for PBXAggregateTarget "Project_base" */;
+                       buildConfigurationList = 78C83A0A189841FA00DB2F64 /* Build configuration list for PBXAggregateTarget "ipsec_executables_embedded" */;
                        buildPhases = (
                        buildPhases = (
-                               815C35FC152522A900502220 /* CopyFiles */,
-                               815C35FD152522AC00502220 /* CopyFiles */,
                        );
                        dependencies = (
                        );
                        dependencies = (
-                               815C35F11525208900502220 /* PBXTargetDependency */,
+                               78C83A111898421300DB2F64 /* PBXTargetDependency */,
+                               78C83A0F1898421100DB2F64 /* PBXTargetDependency */,
                        );
                        );
-                       name = Project_base;
-                       productName = Project_base;
+                       name = ipsec_executables_embedded;
+                       productName = ipsec_executables_embedded;
                };
                };
-               815C35EB1525203F00502220 /* Project_executables */ = {
+               812530AA0D3FE994006BDF4F /* IPSec Embedded (Aggregate) */ = {
                        isa = PBXAggregateTarget;
                        isa = PBXAggregateTarget;
-                       buildConfigurationList = 815C35EC1525203F00502220 /* Build configuration list for PBXAggregateTarget "Project_executables" */;
+                       buildConfigurationList = 812530B50D3FE994006BDF4F /* Build configuration list for PBXAggregateTarget "IPSec Embedded (Aggregate)" */;
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (
-                               815C35F71525209800502220 /* PBXTargetDependency */,
-                               815C35F51525209400502220 /* PBXTargetDependency */,
-                               815C35F31525209000502220 /* PBXTargetDependency */,
+                               69983DBF1E7B4DE4007683BF /* PBXTargetDependency */,
+                               812531110D3FEA28006BDF4F /* PBXTargetDependency */,
+                               81DDFDD90D622C4E00C5CB87 /* PBXTargetDependency */,
+                               81DDFDF10D627DE300C5CB87 /* PBXTargetDependency */,
                        );
                        );
-                       name = Project_executables;
-                       productName = Project_executables;
+                       name = "IPSec Embedded (Aggregate)";
+                       productName = "IPSec (Aggregate) Embedded";
                };
 /* End PBXAggregateTarget section */
 
                };
 /* End PBXAggregateTarget section */
 
@@ -72,28 +97,15 @@
                2537A1BA09E4867A00D0ECDA /* policy_token.l in Sources */ = {isa = PBXBuildFile; fileRef = 252DF9600989B4EE00E5B678 /* policy_token.l */; };
                2537A1C109E494B300D0ECDA /* libipsec.A.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2537A1A809E4864800D0ECDA /* libipsec.A.dylib */; };
                2537A1C709E49D0600D0ECDA /* libipsec.A.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2537A1A809E4864800D0ECDA /* libipsec.A.dylib */; };
                2537A1BA09E4867A00D0ECDA /* policy_token.l in Sources */ = {isa = PBXBuildFile; fileRef = 252DF9600989B4EE00E5B678 /* policy_token.l */; };
                2537A1C109E494B300D0ECDA /* libipsec.A.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2537A1A809E4864800D0ECDA /* libipsec.A.dylib */; };
                2537A1C709E49D0600D0ECDA /* libipsec.A.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2537A1A809E4864800D0ECDA /* libipsec.A.dylib */; };
-               2537A1CB09E49D5600D0ECDA /* libipsec.A.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2537A1A809E4864800D0ECDA /* libipsec.A.dylib */; };
-               2543473209DCAE27007943DE /* racoonctl.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F2590C0988657000D15623 /* racoonctl.c */; };
-               2543474E09DCAEF8007943DE /* str2val.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F2591D0988657000D15623 /* str2val.c */; };
-               2543475109DCB063007943DE /* kmpstat.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E80988657000D15623 /* kmpstat.c */; };
-               2543475509DCB0D9007943DE /* vmbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259260988657000D15623 /* vmbuf.c */; };
-               2543475609DCB0DB007943DE /* sockmisc.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F2591A0988657000D15623 /* sockmisc.c */; };
-               2543475709DCB0E6007943DE /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258EE0988657000D15623 /* misc.c */; };
-               2543476409DCB396007943DE /* pfkey_dump.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F777ED09ABE58400C99783 /* pfkey_dump.c */; };
-               2543476709DCB400007943DE /* key_debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F777B909ABE3E100C99783 /* key_debug.c */; };
-               2543476909DCB420007943DE /* pfkey.c in Sources */ = {isa = PBXBuildFile; fileRef = 25D949A209A6AAD700CA0F24 /* pfkey.c */; };
                258CF2CB0A19197400166B38 /* setkey.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 25F258890988648C00D15623 /* setkey.8 */; };
                258CF2CD0A1919A800166B38 /* ipsec_set_policy.3 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 252DF9540989B4EE00E5B678 /* ipsec_set_policy.3 */; };
                258CF2CE0A1919AF00166B38 /* ipsec_strerror.3 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 252DF9550989B4EE00E5B678 /* ipsec_strerror.3 */; };
                258CF2CB0A19197400166B38 /* setkey.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 25F258890988648C00D15623 /* setkey.8 */; };
                258CF2CD0A1919A800166B38 /* ipsec_set_policy.3 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 252DF9540989B4EE00E5B678 /* ipsec_set_policy.3 */; };
                258CF2CE0A1919AF00166B38 /* ipsec_strerror.3 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 252DF9550989B4EE00E5B678 /* ipsec_strerror.3 */; };
-               258CF2D20A191A0600166B38 /* racoonctl.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 25F2590B0988657000D15623 /* racoonctl.8 */; };
                258CF2E10A191A9200166B38 /* racoon.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 25F259090988657000D15623 /* racoon.8 */; };
                258CF2E40A191AD500166B38 /* racoon.conf.5 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 25F2590A0988657000D15623 /* racoon.conf.5 */; };
                25DC9ED409DB16F300C89F86 /* isakmp_cfg.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D50988657000D15623 /* isakmp_cfg.c */; };
                25DC9ED509DB16F800C89F86 /* isakmp_unity.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E10988657000D15623 /* isakmp_unity.c */; };
                25DC9ED609DB16FA00C89F86 /* isakmp_xauth.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E40988657000D15623 /* isakmp_xauth.c */; };
                25DE2DE90A8BD40E0010A46D /* vpn_control.c in Sources */ = {isa = PBXBuildFile; fileRef = 25DE2DE60A8BD40E0010A46D /* vpn_control.c */; };
                258CF2E10A191A9200166B38 /* racoon.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 25F259090988657000D15623 /* racoon.8 */; };
                258CF2E40A191AD500166B38 /* racoon.conf.5 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 25F2590A0988657000D15623 /* racoon.conf.5 */; };
                25DC9ED409DB16F300C89F86 /* isakmp_cfg.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D50988657000D15623 /* isakmp_cfg.c */; };
                25DC9ED509DB16F800C89F86 /* isakmp_unity.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E10988657000D15623 /* isakmp_unity.c */; };
                25DC9ED609DB16FA00C89F86 /* isakmp_xauth.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E40988657000D15623 /* isakmp_xauth.c */; };
                25DE2DE90A8BD40E0010A46D /* vpn_control.c in Sources */ = {isa = PBXBuildFile; fileRef = 25DE2DE60A8BD40E0010A46D /* vpn_control.c */; };
-               25EAE84809D879700042CC7F /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE84709D879700042CC7F /* libssl.dylib */; };
-               25EAE84B09D879DE0042CC7F /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE84A09D879DE0042CC7F /* libcrypto.dylib */; };
                25EAE87709D87A770042CC7F /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE87609D87A770042CC7F /* libiconv.dylib */; };
                25EAE8C109D87B080042CC7F /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE8C009D87B080042CC7F /* CoreFoundation.framework */; };
                25EAE8C609D87B990042CC7F /* pfkey.c in Sources */ = {isa = PBXBuildFile; fileRef = 25D949A209A6AAD700CA0F24 /* pfkey.c */; };
                25EAE87709D87A770042CC7F /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE87609D87A770042CC7F /* libiconv.dylib */; };
                25EAE8C109D87B080042CC7F /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE8C009D87B080042CC7F /* CoreFoundation.framework */; };
                25EAE8C609D87B990042CC7F /* pfkey.c in Sources */ = {isa = PBXBuildFile; fileRef = 25D949A209A6AAD700CA0F24 /* pfkey.c */; };
@@ -103,36 +115,28 @@
                25F258900988648C00D15623 /* parse.y in Sources */ = {isa = PBXBuildFile; fileRef = 25F258870988648C00D15623 /* parse.y */; };
                25F258910988648C00D15623 /* setkey.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F2588A0988648C00D15623 /* setkey.c */; };
                25F258940988648C00D15623 /* token.l in Sources */ = {isa = PBXBuildFile; fileRef = 25F2588D0988648C00D15623 /* token.l */; };
                25F258900988648C00D15623 /* parse.y in Sources */ = {isa = PBXBuildFile; fileRef = 25F258870988648C00D15623 /* parse.y */; };
                25F258910988648C00D15623 /* setkey.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F2588A0988648C00D15623 /* setkey.c */; };
                25F258940988648C00D15623 /* token.l in Sources */ = {isa = PBXBuildFile; fileRef = 25F2588D0988648C00D15623 /* token.l */; };
-               25F259280988657000D15623 /* admin.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258AC0988657000D15623 /* admin.c */; };
                25F259290988657000D15623 /* algorithm.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258AE0988657000D15623 /* algorithm.c */; };
                25F259290988657000D15623 /* algorithm.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258AE0988657000D15623 /* algorithm.c */; };
-               25F2592A0988657000D15623 /* backupsa.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B10988657000D15623 /* backupsa.c */; };
                25F2592B0988657000D15623 /* cfparse.y in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B40988657000D15623 /* cfparse.y */; };
                25F2592C0988657000D15623 /* cftoken.l in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B60988657000D15623 /* cftoken.l */; };
                25F2592E0988657000D15623 /* crypto_openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B90988657000D15623 /* crypto_openssl.c */; };
                25F2592F0988657000D15623 /* dnssec.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258BE0988657000D15623 /* dnssec.c */; };
                25F2592B0988657000D15623 /* cfparse.y in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B40988657000D15623 /* cfparse.y */; };
                25F2592C0988657000D15623 /* cftoken.l in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B60988657000D15623 /* cftoken.l */; };
                25F2592E0988657000D15623 /* crypto_openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B90988657000D15623 /* crypto_openssl.c */; };
                25F2592F0988657000D15623 /* dnssec.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258BE0988657000D15623 /* dnssec.c */; };
-               25F259310988657000D15623 /* evt.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C20988657000D15623 /* evt.c */; };
                25F259320988657000D15623 /* genlist.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C50988657000D15623 /* genlist.c */; };
                25F259330988657000D15623 /* getcertsbyname.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C70988657000D15623 /* getcertsbyname.c */; };
                25F259340988657000D15623 /* grabmyaddr.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C90988657000D15623 /* grabmyaddr.c */; };
                25F259320988657000D15623 /* genlist.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C50988657000D15623 /* genlist.c */; };
                25F259330988657000D15623 /* getcertsbyname.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C70988657000D15623 /* getcertsbyname.c */; };
                25F259340988657000D15623 /* grabmyaddr.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C90988657000D15623 /* grabmyaddr.c */; };
-               25F259350988657000D15623 /* gssapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258CB0988657000D15623 /* gssapi.c */; };
                25F259360988657000D15623 /* handler.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258CD0988657000D15623 /* handler.c */; };
                25F259370988657000D15623 /* ipsec_doi.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258CF0988657000D15623 /* ipsec_doi.c */; };
                25F259380988657000D15623 /* isakmp_agg.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D10988657000D15623 /* isakmp_agg.c */; };
                25F259360988657000D15623 /* handler.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258CD0988657000D15623 /* handler.c */; };
                25F259370988657000D15623 /* ipsec_doi.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258CF0988657000D15623 /* ipsec_doi.c */; };
                25F259380988657000D15623 /* isakmp_agg.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D10988657000D15623 /* isakmp_agg.c */; };
-               25F259390988657000D15623 /* isakmp_base.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D30988657000D15623 /* isakmp_base.c */; };
                25F2593C0988657000D15623 /* isakmp_ident.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D90988657000D15623 /* isakmp_ident.c */; };
                25F2593D0988657000D15623 /* isakmp_inf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258DB0988657000D15623 /* isakmp_inf.c */; };
                25F2593C0988657000D15623 /* isakmp_ident.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D90988657000D15623 /* isakmp_ident.c */; };
                25F2593D0988657000D15623 /* isakmp_inf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258DB0988657000D15623 /* isakmp_inf.c */; };
-               25F2593E0988657000D15623 /* isakmp_newg.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258DD0988657000D15623 /* isakmp_newg.c */; };
                25F2593F0988657000D15623 /* isakmp_quick.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258DF0988657000D15623 /* isakmp_quick.c */; };
                25F259420988657000D15623 /* isakmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E60988657000D15623 /* isakmp.c */; };
                25F259440988657000D15623 /* localconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E90988657000D15623 /* localconf.c */; };
                25F2593F0988657000D15623 /* isakmp_quick.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258DF0988657000D15623 /* isakmp_quick.c */; };
                25F259420988657000D15623 /* isakmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E60988657000D15623 /* isakmp.c */; };
                25F259440988657000D15623 /* localconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E90988657000D15623 /* localconf.c */; };
-               25F259450988657000D15623 /* logger.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258EB0988657000D15623 /* logger.c */; };
                25F259460988657000D15623 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258ED0988657000D15623 /* main.c */; };
                25F259470988657000D15623 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258EE0988657000D15623 /* misc.c */; };
                25F259490988657000D15623 /* oakley.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258F30988657000D15623 /* oakley.c */; };
                25F2594C0988657000D15623 /* pfkey_racoon.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258F80988657000D15623 /* pfkey_racoon.c */; };
                25F2594F0988657000D15623 /* plog.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258FD0988657000D15623 /* plog.c */; };
                25F259500988657000D15623 /* policy.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258FF0988657000D15623 /* policy.c */; };
                25F259460988657000D15623 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258ED0988657000D15623 /* main.c */; };
                25F259470988657000D15623 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258EE0988657000D15623 /* misc.c */; };
                25F259490988657000D15623 /* oakley.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258F30988657000D15623 /* oakley.c */; };
                25F2594C0988657000D15623 /* pfkey_racoon.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258F80988657000D15623 /* pfkey_racoon.c */; };
                25F2594F0988657000D15623 /* plog.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258FD0988657000D15623 /* plog.c */; };
                25F259500988657000D15623 /* policy.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258FF0988657000D15623 /* policy.c */; };
-               25F259510988657000D15623 /* privsep.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259010988657000D15623 /* privsep.c */; };
                25F259520988657000D15623 /* proposal.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259030988657000D15623 /* proposal.c */; };
                25F259580988657000D15623 /* remoteconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F2590E0988657000D15623 /* remoteconf.c */; };
                25F2595A0988657000D15623 /* safefile.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259120988657000D15623 /* safefile.c */; };
                25F259520988657000D15623 /* proposal.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259030988657000D15623 /* proposal.c */; };
                25F259580988657000D15623 /* remoteconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F2590E0988657000D15623 /* remoteconf.c */; };
                25F2595A0988657000D15623 /* safefile.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259120988657000D15623 /* safefile.c */; };
@@ -145,37 +149,46 @@
                25F259610988657000D15623 /* throttle.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259210988657000D15623 /* throttle.c */; };
                25F259620988657000D15623 /* vendorid.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259240988657000D15623 /* vendorid.c */; };
                25F259630988657000D15623 /* vmbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259260988657000D15623 /* vmbuf.c */; };
                25F259610988657000D15623 /* throttle.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259210988657000D15623 /* throttle.c */; };
                25F259620988657000D15623 /* vendorid.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259240988657000D15623 /* vendorid.c */; };
                25F259630988657000D15623 /* vmbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259260988657000D15623 /* vmbuf.c */; };
+               6912CB6E1E78D94B00631D9A /* crypto_cssm.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B70988657000D15623 /* crypto_cssm.c */; };
+               6912CB701E78D96900631D9A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6912CB6F1E78D96900631D9A /* Security.framework */; };
+               6912CB721E78D97200631D9A /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6912CB711E78D97200631D9A /* CoreFoundation.framework */; };
+               6912CB731E78D9A900631D9A /* vmbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259260988657000D15623 /* vmbuf.c */; };
+               6912CB741E78D9D800631D9A /* plog.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258FD0988657000D15623 /* plog.c */; };
+               6912CB761E78DD7100631D9A /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6912CB751E78DD7100631D9A /* SystemConfiguration.framework */; };
+               6912CB771E78DD8800631D9A /* Preferences.c in Sources */ = {isa = PBXBuildFile; fileRef = BACD8C681496A50C0042DEA1 /* Preferences.c */; };
+               72265DDC0F818F9300730A7D /* ipsec.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 72265DDB0F818F9300730A7D /* ipsec.plist */; };
+               723B6A30162F7BE300895EE5 /* xpc_racoon.c in Sources */ = {isa = PBXBuildFile; fileRef = 723B6A2F162F7BE300895EE5 /* xpc_racoon.c */; };
+               723B6A31162F7BE300895EE5 /* xpc_racoon.c in Sources */ = {isa = PBXBuildFile; fileRef = 723B6A2F162F7BE300895EE5 /* xpc_racoon.c */; };
+               724ED87916851AAC008F2EBD /* ipsec.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = BACBF18B10290AE000BBFC85 /* ipsec.txt */; };
+               724ED87A16851AB6008F2EBD /* ipsec.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 72265DDB0F818F9300730A7D /* ipsec.plist */; };
+               7253CC651E7B3F4600B2DDF5 /* racoon_test.c in Sources */ = {isa = PBXBuildFile; fileRef = 7253CC611E7B3EAB00B2DDF5 /* racoon_test.c */; };
                72B433770E3677D800D67508 /* com.apple.racoon.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 724F99500E3672FD00C56897 /* com.apple.racoon.plist */; };
                72B433770E3677D800D67508 /* com.apple.racoon.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 724F99500E3672FD00C56897 /* com.apple.racoon.plist */; };
-               812530C20D3FE9DC006BDF4F /* admin.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258AC0988657000D15623 /* admin.c */; };
+               72F5C72E1607A1AE004C192F /* api_support.c in Sources */ = {isa = PBXBuildFile; fileRef = 72F5C72D1607A1AE004C192F /* api_support.c */; };
+               72F5C72F1607A1AE004C192F /* api_support.c in Sources */ = {isa = PBXBuildFile; fileRef = 72F5C72D1607A1AE004C192F /* api_support.c */; };
+               7822D11E188DB07300874E91 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7822D11D188DB07300874E91 /* NetworkExtension.framework */; };
+               7822D120188DB07C00874E91 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7822D11F188DB07C00874E91 /* NetworkExtension.framework */; };
                812530C30D3FE9DC006BDF4F /* algorithm.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258AE0988657000D15623 /* algorithm.c */; };
                812530C30D3FE9DC006BDF4F /* algorithm.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258AE0988657000D15623 /* algorithm.c */; };
-               812530C40D3FE9DC006BDF4F /* backupsa.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B10988657000D15623 /* backupsa.c */; };
                812530C50D3FE9DC006BDF4F /* cfparse.y in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B40988657000D15623 /* cfparse.y */; };
                812530C60D3FE9DC006BDF4F /* cftoken.l in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B60988657000D15623 /* cftoken.l */; };
                812530C70D3FE9DC006BDF4F /* crypto_openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B90988657000D15623 /* crypto_openssl.c */; };
                812530C80D3FE9DC006BDF4F /* dnssec.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258BE0988657000D15623 /* dnssec.c */; };
                812530C50D3FE9DC006BDF4F /* cfparse.y in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B40988657000D15623 /* cfparse.y */; };
                812530C60D3FE9DC006BDF4F /* cftoken.l in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B60988657000D15623 /* cftoken.l */; };
                812530C70D3FE9DC006BDF4F /* crypto_openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B90988657000D15623 /* crypto_openssl.c */; };
                812530C80D3FE9DC006BDF4F /* dnssec.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258BE0988657000D15623 /* dnssec.c */; };
-               812530C90D3FE9DC006BDF4F /* evt.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C20988657000D15623 /* evt.c */; };
                812530CA0D3FE9DC006BDF4F /* genlist.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C50988657000D15623 /* genlist.c */; };
                812530CB0D3FE9DC006BDF4F /* getcertsbyname.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C70988657000D15623 /* getcertsbyname.c */; };
                812530CC0D3FE9DC006BDF4F /* grabmyaddr.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C90988657000D15623 /* grabmyaddr.c */; };
                812530CA0D3FE9DC006BDF4F /* genlist.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C50988657000D15623 /* genlist.c */; };
                812530CB0D3FE9DC006BDF4F /* getcertsbyname.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C70988657000D15623 /* getcertsbyname.c */; };
                812530CC0D3FE9DC006BDF4F /* grabmyaddr.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258C90988657000D15623 /* grabmyaddr.c */; };
-               812530CD0D3FE9DC006BDF4F /* gssapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258CB0988657000D15623 /* gssapi.c */; };
                812530CE0D3FE9DC006BDF4F /* handler.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258CD0988657000D15623 /* handler.c */; };
                812530CF0D3FE9DC006BDF4F /* ipsec_doi.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258CF0988657000D15623 /* ipsec_doi.c */; };
                812530D00D3FE9DC006BDF4F /* isakmp_agg.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D10988657000D15623 /* isakmp_agg.c */; };
                812530CE0D3FE9DC006BDF4F /* handler.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258CD0988657000D15623 /* handler.c */; };
                812530CF0D3FE9DC006BDF4F /* ipsec_doi.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258CF0988657000D15623 /* ipsec_doi.c */; };
                812530D00D3FE9DC006BDF4F /* isakmp_agg.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D10988657000D15623 /* isakmp_agg.c */; };
-               812530D10D3FE9DC006BDF4F /* isakmp_base.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D30988657000D15623 /* isakmp_base.c */; };
                812530D20D3FE9DC006BDF4F /* isakmp_ident.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D90988657000D15623 /* isakmp_ident.c */; };
                812530D30D3FE9DC006BDF4F /* isakmp_inf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258DB0988657000D15623 /* isakmp_inf.c */; };
                812530D20D3FE9DC006BDF4F /* isakmp_ident.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D90988657000D15623 /* isakmp_ident.c */; };
                812530D30D3FE9DC006BDF4F /* isakmp_inf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258DB0988657000D15623 /* isakmp_inf.c */; };
-               812530D40D3FE9DC006BDF4F /* isakmp_newg.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258DD0988657000D15623 /* isakmp_newg.c */; };
                812530D50D3FE9DC006BDF4F /* isakmp_quick.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258DF0988657000D15623 /* isakmp_quick.c */; };
                812530D60D3FE9DC006BDF4F /* isakmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E60988657000D15623 /* isakmp.c */; };
                812530D70D3FE9DC006BDF4F /* localconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E90988657000D15623 /* localconf.c */; };
                812530D50D3FE9DC006BDF4F /* isakmp_quick.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258DF0988657000D15623 /* isakmp_quick.c */; };
                812530D60D3FE9DC006BDF4F /* isakmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E60988657000D15623 /* isakmp.c */; };
                812530D70D3FE9DC006BDF4F /* localconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E90988657000D15623 /* localconf.c */; };
-               812530D80D3FE9DC006BDF4F /* logger.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258EB0988657000D15623 /* logger.c */; };
                812530D90D3FE9DC006BDF4F /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258ED0988657000D15623 /* main.c */; };
                812530DA0D3FE9DC006BDF4F /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258EE0988657000D15623 /* misc.c */; };
                812530DB0D3FE9DC006BDF4F /* oakley.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258F30988657000D15623 /* oakley.c */; };
                812530DC0D3FE9DC006BDF4F /* pfkey_racoon.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258F80988657000D15623 /* pfkey_racoon.c */; };
                812530DD0D3FE9DC006BDF4F /* plog.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258FD0988657000D15623 /* plog.c */; };
                812530DE0D3FE9DC006BDF4F /* policy.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258FF0988657000D15623 /* policy.c */; };
                812530D90D3FE9DC006BDF4F /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258ED0988657000D15623 /* main.c */; };
                812530DA0D3FE9DC006BDF4F /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258EE0988657000D15623 /* misc.c */; };
                812530DB0D3FE9DC006BDF4F /* oakley.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258F30988657000D15623 /* oakley.c */; };
                812530DC0D3FE9DC006BDF4F /* pfkey_racoon.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258F80988657000D15623 /* pfkey_racoon.c */; };
                812530DD0D3FE9DC006BDF4F /* plog.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258FD0988657000D15623 /* plog.c */; };
                812530DE0D3FE9DC006BDF4F /* policy.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258FF0988657000D15623 /* policy.c */; };
-               812530DF0D3FE9DC006BDF4F /* privsep.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259010988657000D15623 /* privsep.c */; };
                812530E00D3FE9DC006BDF4F /* proposal.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259030988657000D15623 /* proposal.c */; };
                812530E10D3FE9DC006BDF4F /* remoteconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F2590E0988657000D15623 /* remoteconf.c */; };
                812530E20D3FE9DC006BDF4F /* safefile.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259120988657000D15623 /* safefile.c */; };
                812530E00D3FE9DC006BDF4F /* proposal.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259030988657000D15623 /* proposal.c */; };
                812530E10D3FE9DC006BDF4F /* remoteconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F2590E0988657000D15623 /* remoteconf.c */; };
                812530E20D3FE9DC006BDF4F /* safefile.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259120988657000D15623 /* safefile.c */; };
@@ -199,23 +212,10 @@
                812530F90D3FE9DC006BDF4F /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE8C009D87B080042CC7F /* CoreFoundation.framework */; };
                812530FC0D3FE9DC006BDF4F /* racoon.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 25F259090988657000D15623 /* racoon.8 */; };
                812530FE0D3FE9DC006BDF4F /* racoon.conf.5 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 25F2590A0988657000D15623 /* racoon.conf.5 */; };
                812530F90D3FE9DC006BDF4F /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE8C009D87B080042CC7F /* CoreFoundation.framework */; };
                812530FC0D3FE9DC006BDF4F /* racoon.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 25F259090988657000D15623 /* racoon.8 */; };
                812530FE0D3FE9DC006BDF4F /* racoon.conf.5 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 25F2590A0988657000D15623 /* racoon.conf.5 */; };
-               812531160D3FEA33006BDF4F /* racoonctl.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F2590C0988657000D15623 /* racoonctl.c */; };
-               812531170D3FEA33006BDF4F /* str2val.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F2591D0988657000D15623 /* str2val.c */; };
-               812531180D3FEA33006BDF4F /* kmpstat.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258E80988657000D15623 /* kmpstat.c */; };
-               812531190D3FEA33006BDF4F /* vmbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F259260988657000D15623 /* vmbuf.c */; };
-               8125311A0D3FEA33006BDF4F /* sockmisc.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F2591A0988657000D15623 /* sockmisc.c */; };
-               8125311B0D3FEA33006BDF4F /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258EE0988657000D15623 /* misc.c */; };
-               8125311C0D3FEA33006BDF4F /* pfkey_dump.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F777ED09ABE58400C99783 /* pfkey_dump.c */; };
-               8125311D0D3FEA33006BDF4F /* key_debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F777B909ABE3E100C99783 /* key_debug.c */; };
-               8125311E0D3FEA33006BDF4F /* pfkey.c in Sources */ = {isa = PBXBuildFile; fileRef = 25D949A209A6AAD700CA0F24 /* pfkey.c */; };
-               812531220D3FEA33006BDF4F /* racoonctl.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 25F2590B0988657000D15623 /* racoonctl.8 */; };
                812A64ED0D4AA082004CB7EB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812A64EC0D4AA082004CB7EB /* Security.framework */; };
                812A64ED0D4AA082004CB7EB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812A64EC0D4AA082004CB7EB /* Security.framework */; };
-               815C35FE152522CE00502220 /* ipsec.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 72265DDB0F818F9300730A7D /* ipsec.plist */; };
-               815C35FF152522EB00502220 /* ipsec.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = BACBF18B10290AE000BBFC85 /* ipsec.txt */; };
+               8141336B149015E900028D76 /* fsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 81CBCFE81447A1C20000D6E6 /* fsm.c */; };
                8167917B0D650BAA006B523F /* racoon.conf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8187103A0D5BE18800C7B441 /* racoon.conf */; };
                8167917B0D650BAA006B523F /* racoon.conf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8187103A0D5BE18800C7B441 /* racoon.conf */; };
-               8176A6B90D45661700BC5251 /* libldap.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8176A6B80D45661700BC5251 /* libldap.dylib */; };
                817FFC4E0D6134A7004A8DD8 /* libipsec.A.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2537A1A809E4864800D0ECDA /* libipsec.A.dylib */; };
                817FFC4E0D6134A7004A8DD8 /* libipsec.A.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2537A1A809E4864800D0ECDA /* libipsec.A.dylib */; };
-               817FFC5A0D613729004A8DD8 /* libipsec.A.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2537A1A809E4864800D0ECDA /* libipsec.A.dylib */; };
                818710410D5BE22B00C7B441 /* psk.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8187103D0D5BE1CF00C7B441 /* psk.txt */; };
                818710420D5BE22F00C7B441 /* racoon.conf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8187103B0D5BE1B400C7B441 /* racoon.conf */; };
                818710510D5BE29300C7B441 /* psk.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8187103D0D5BE1CF00C7B441 /* psk.txt */; };
                818710410D5BE22B00C7B441 /* psk.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8187103D0D5BE1CF00C7B441 /* psk.txt */; };
                818710420D5BE22F00C7B441 /* racoon.conf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8187103B0D5BE1B400C7B441 /* racoon.conf */; };
                818710510D5BE29300C7B441 /* psk.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8187103D0D5BE1CF00C7B441 /* psk.txt */; };
@@ -224,13 +224,12 @@
                81C386AA0D451EC300975D5E /* crypto_cssm.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B70988657000D15623 /* crypto_cssm.c */; };
                81C387560D45208700975D5E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE83109D875790042CC7F /* Security.framework */; };
                81C387570D45208700975D5E /* DirectoryService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE83709D875BF0042CC7F /* DirectoryService.framework */; };
                81C386AA0D451EC300975D5E /* crypto_cssm.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258B70988657000D15623 /* crypto_cssm.c */; };
                81C387560D45208700975D5E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE83109D875790042CC7F /* Security.framework */; };
                81C387570D45208700975D5E /* DirectoryService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE83709D875BF0042CC7F /* DirectoryService.framework */; };
-               81C3877A0D4524E700975D5E /* libpam.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE87309D87A390042CC7F /* libpam.dylib */; };
-               81C387890D4524F600975D5E /* libgssapi_krb5.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 25EAE87109D87A160042CC7F /* libgssapi_krb5.dylib */; };
                81C387EC0D45268300975D5E /* open_dir.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258F50988657000D15623 /* open_dir.c */; };
                81C964590DA2CBEF00257BC8 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C964580DA2CBEF00257BC8 /* SystemConfiguration.framework */; };
                81C9645E0DA2CC2D00257BC8 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C9645D0DA2CC2D00257BC8 /* SystemConfiguration.framework */; };
                81C9645F0DA2CC2D00257BC8 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C9645D0DA2CC2D00257BC8 /* SystemConfiguration.framework */; };
                81CA08920CE3BC870055C0AF /* vpn.c in Sources */ = {isa = PBXBuildFile; fileRef = 81CA08910CE3BC870055C0AF /* vpn.c */; };
                81C387EC0D45268300975D5E /* open_dir.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258F50988657000D15623 /* open_dir.c */; };
                81C964590DA2CBEF00257BC8 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C964580DA2CBEF00257BC8 /* SystemConfiguration.framework */; };
                81C9645E0DA2CC2D00257BC8 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C9645D0DA2CC2D00257BC8 /* SystemConfiguration.framework */; };
                81C9645F0DA2CC2D00257BC8 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C9645D0DA2CC2D00257BC8 /* SystemConfiguration.framework */; };
                81CA08920CE3BC870055C0AF /* vpn.c in Sources */ = {isa = PBXBuildFile; fileRef = 81CA08910CE3BC870055C0AF /* vpn.c */; };
+               81CBCFE91447A1C20000D6E6 /* fsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 81CBCFE81447A1C20000D6E6 /* fsm.c */; };
                81DDFD9B0D622C1700C5CB87 /* parse.y in Sources */ = {isa = PBXBuildFile; fileRef = 25F258870988648C00D15623 /* parse.y */; };
                81DDFD9C0D622C1700C5CB87 /* pfkey_dump.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F777ED09ABE58400C99783 /* pfkey_dump.c */; };
                81DDFD9D0D622C1700C5CB87 /* key_debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F777B909ABE3E100C99783 /* key_debug.c */; };
                81DDFD9B0D622C1700C5CB87 /* parse.y in Sources */ = {isa = PBXBuildFile; fileRef = 25F258870988648C00D15623 /* parse.y */; };
                81DDFD9C0D622C1700C5CB87 /* pfkey_dump.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F777ED09ABE58400C99783 /* pfkey_dump.c */; };
                81DDFD9D0D622C1700C5CB87 /* key_debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F777B909ABE3E100C99783 /* key_debug.c */; };
@@ -266,106 +265,94 @@
                BA5B6F310EC19F80003774E7 /* ipsecPolicyTracer.c in Sources */ = {isa = PBXBuildFile; fileRef = BA5B6F300EC19F80003774E7 /* ipsecPolicyTracer.c */; };
                BA5B6F320EC19F80003774E7 /* ipsecPolicyTracer.c in Sources */ = {isa = PBXBuildFile; fileRef = BA5B6F300EC19F80003774E7 /* ipsecPolicyTracer.c */; };
                BA64A934114EFE8C00F3574C /* racoon.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = BA64A933114EFE5C00F3574C /* racoon.sb */; };
                BA5B6F310EC19F80003774E7 /* ipsecPolicyTracer.c in Sources */ = {isa = PBXBuildFile; fileRef = BA5B6F300EC19F80003774E7 /* ipsecPolicyTracer.c */; };
                BA5B6F320EC19F80003774E7 /* ipsecPolicyTracer.c in Sources */ = {isa = PBXBuildFile; fileRef = BA5B6F300EC19F80003774E7 /* ipsecPolicyTracer.c */; };
                BA64A934114EFE8C00F3574C /* racoon.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = BA64A933114EFE5C00F3574C /* racoon.sb */; };
-               BA64A935114EFE9900F3574C /* racoon.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = BA64A933114EFE5C00F3574C /* racoon.sb */; };
                BA6F109B0EA1DEC200546773 /* ike_session.c in Sources */ = {isa = PBXBuildFile; fileRef = BA6F109A0EA1DEC200546773 /* ike_session.c */; };
                BA6F109C0EA1DEC200546773 /* ike_session.c in Sources */ = {isa = PBXBuildFile; fileRef = BA6F109A0EA1DEC200546773 /* ike_session.c */; };
                BA7777A11107EBCE00DD87E1 /* isakmp_frag.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D70988657000D15623 /* isakmp_frag.c */; };
                BA7777A21107EBF600DD87E1 /* isakmp_frag.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D70988657000D15623 /* isakmp_frag.c */; };
                BA6F109B0EA1DEC200546773 /* ike_session.c in Sources */ = {isa = PBXBuildFile; fileRef = BA6F109A0EA1DEC200546773 /* ike_session.c */; };
                BA6F109C0EA1DEC200546773 /* ike_session.c in Sources */ = {isa = PBXBuildFile; fileRef = BA6F109A0EA1DEC200546773 /* ike_session.c */; };
                BA7777A11107EBCE00DD87E1 /* isakmp_frag.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D70988657000D15623 /* isakmp_frag.c */; };
                BA7777A21107EBF600DD87E1 /* isakmp_frag.c in Sources */ = {isa = PBXBuildFile; fileRef = 25F258D70988657000D15623 /* isakmp_frag.c */; };
+               BACBF18C10290AE000BBFC85 /* ipsec.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = BACBF18B10290AE000BBFC85 /* ipsec.txt */; };
+               BACD8C6A1496A50C0042DEA1 /* Preferences.c in Sources */ = {isa = PBXBuildFile; fileRef = BACD8C681496A50C0042DEA1 /* Preferences.c */; };
+               BACD8C6B1496A50C0042DEA1 /* Preferences.c in Sources */ = {isa = PBXBuildFile; fileRef = BACD8C681496A50C0042DEA1 /* Preferences.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-               2537A1C209E494D300D0ECDA /* PBXContainerItemProxy */ = {
+               69983DBC1E7B3D30007683BF /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 2537A1A709E4864800D0ECDA;
-                       remoteInfo = libipsec;
+                       remoteGlobalIDString = 69BB7E331E777E3C009EE2BA;
+                       remoteInfo = racoon_test;
                };
                };
-               2537A1C809E49D1400D0ECDA /* PBXContainerItemProxy */ = {
+               69983DBE1E7B4DE4007683BF /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 2537A1A709E4864800D0ECDA;
-                       remoteInfo = libipsec;
+                       remoteGlobalIDString = 69BB7E331E777E3C009EE2BA;
+                       remoteInfo = racoon_test;
                };
                };
-               2537A1CC09E49D5C00D0ECDA /* PBXContainerItemProxy */ = {
+               724ED875168515A7008F2EBD /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 2537A1A709E4864800D0ECDA;
-                       remoteInfo = libipsec;
+                       remoteGlobalIDString = 72B3C21116850B87004E4548;
+                       remoteInfo = ipsec_libraries;
                };
                };
-               812531100D3FEA28006BDF4F /* PBXContainerItemProxy */ = {
+               72B3C20D1684F5DE004E4548 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 812530BA0D3FE9DC006BDF4F;
-                       remoteInfo = "racoon arm";
+                       remoteGlobalIDString = 25F258040987FBFA00D15623;
+                       remoteInfo = racoon;
                };
                };
-               8125312B0D3FEA44006BDF4F /* PBXContainerItemProxy */ = {
+               72B3C20F1684F5E1004E4548 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 812531120D3FEA33006BDF4F;
-                       remoteInfo = "racoonctl arm";
+                       remoteGlobalIDString = 25F258090987FC1500D15623;
+                       remoteInfo = setkey;
                };
                };
-               815C35F01525208900502220 /* PBXContainerItemProxy */ = {
+               72B3C21616850BA0004E4548 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = 2537A1A709E4864800D0ECDA;
                        remoteInfo = libipsec;
                };
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = 2537A1A709E4864800D0ECDA;
                        remoteInfo = libipsec;
                };
-               815C35F21525209000502220 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 23D2D790087071FC00C51098 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 25F258040987FBFA00D15623;
-                       remoteInfo = racoon;
-               };
-               815C35F41525209400502220 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 23D2D790087071FC00C51098 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 25F2580E0987FC3400D15623;
-                       remoteInfo = racoonctl;
-               };
-               815C35F61525209800502220 /* PBXContainerItemProxy */ = {
+               72B3C21816850CC5004E4548 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 25F258090987FC1500D15623;
-                       remoteInfo = setkey;
+                       remoteGlobalIDString = 72B3C2081684F5C4004E4548;
+                       remoteInfo = ipsec_executables;
                };
                };
-               815C35F8152520BC00502220 /* PBXContainerItemProxy */ = {
+               78C83A0E1898421100DB2F64 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 815C35E61525201900502220;
-                       remoteInfo = Project_base;
+                       remoteGlobalIDString = 812530BA0D3FE9DC006BDF4F;
+                       remoteInfo = "racoon Embedded";
                };
                };
-               815C35FA152520C000502220 /* PBXContainerItemProxy */ = {
+               78C83A101898421300DB2F64 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 815C35EB1525203F00502220;
-                       remoteInfo = Project_executables;
+                       remoteGlobalIDString = 81DDFD970D622C1700C5CB87;
+                       remoteInfo = "setkey Embedded";
                };
                };
-               81DDFDD80D622C4E00C5CB87 /* PBXContainerItemProxy */ = {
+               78C83A121898421900DB2F64 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = 81DDFDB80D622C2700C5CB87;
                        remoteInfo = "libipsec Embedded";
                };
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = 81DDFDB80D622C2700C5CB87;
                        remoteInfo = "libipsec Embedded";
                };
-               81DDFDDE0D622D1700C5CB87 /* PBXContainerItemProxy */ = {
+               812531100D3FEA28006BDF4F /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 81DDFDB80D622C2700C5CB87;
-                       remoteInfo = "libipsec Embedded";
+                       remoteGlobalIDString = 812530BA0D3FE9DC006BDF4F;
+                       remoteInfo = "racoon arm";
                };
                };
-               81DDFDE30D622D8C00C5CB87 /* PBXContainerItemProxy */ = {
+               81DDFDD80D622C4E00C5CB87 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 23D2D790087071FC00C51098 /* Project object */;
                        proxyType = 1;
@@ -405,16 +392,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               258CF2D50A191A6E00166B38 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/share/man/man8;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               258CF2D20A191A0600166B38 /* racoonctl.8 in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
-               };
                258CF2E20A191AB000166B38 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                258CF2E20A191AB000166B38 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
@@ -446,94 +423,103 @@
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               724A38A20E3676FB00F6B25F /* CopyFiles */ = {
+               69BB7E321E777E3C009EE2BA /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               72265DD80F818ED700730A7D /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
-                       dstPath = /System/Library/LaunchDaemons;
+                       dstPath = /usr/local/OpenSourceVersions/;
                        dstSubfolderSpec = 0;
                        files = (
                        dstSubfolderSpec = 0;
                        files = (
-                               72B433770E3677D800D67508 /* com.apple.racoon.plist in CopyFiles */,
+                               72265DDC0F818F9300730A7D /* ipsec.plist in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               725F453B0E36A15C005BB55C /* CopyFiles */ = {
+               724A38A20E3676FB00F6B25F /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        dstPath = /System/Library/LaunchDaemons;
                        dstSubfolderSpec = 0;
                        files = (
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        dstPath = /System/Library/LaunchDaemons;
                        dstSubfolderSpec = 0;
                        files = (
-                               834072A90EDCC5AC00B6CCE8 /* com.apple.racoon.plist in CopyFiles */,
+                               72B433770E3677D800D67508 /* com.apple.racoon.plist in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               812530FB0D3FE9DC006BDF4F /* CopyFiles */ = {
+               725F453B0E36A15C005BB55C /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
-                       dstPath = /usr/share/man/man8;
+                       dstPath = /System/Library/LaunchDaemons;
                        dstSubfolderSpec = 0;
                        files = (
                        dstSubfolderSpec = 0;
                        files = (
-                               812530FC0D3FE9DC006BDF4F /* racoon.8 in CopyFiles */,
+                               834072A90EDCC5AC00B6CCE8 /* com.apple.racoon.plist in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               812530FD0D3FE9DC006BDF4F /* CopyFiles */ = {
+               72B3C21C16850D02004E4548 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
-                       dstPath = /usr/share/man/man5;
+                       dstPath = /usr/local/OpenSourceLicenses;
                        dstSubfolderSpec = 0;
                        files = (
                        dstSubfolderSpec = 0;
                        files = (
-                               812530FE0D3FE9DC006BDF4F /* racoon.conf.5 in CopyFiles */,
+                               724ED87916851AAC008F2EBD /* ipsec.txt in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               812530FF0D3FE9DC006BDF4F /* CopyFiles */ = {
+               72B3C21E16850D1E004E4548 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
-                       dstPath = /private/etc/racoon/remote;
+                       dstPath = /usr/local/OpenSourceVersions/;
                        dstSubfolderSpec = 0;
                        files = (
                        dstSubfolderSpec = 0;
                        files = (
-                               818710530D5BE2B500C7B441 /* anonymous.conf in CopyFiles */,
+                               724ED87A16851AB6008F2EBD /* ipsec.plist in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               812531020D3FE9DC006BDF4F /* CopyFiles */ = {
+               812530FB0D3FE9DC006BDF4F /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
-                       dstPath = /private/etc/racoon;
+                       dstPath = /usr/share/man/man8;
                        dstSubfolderSpec = 0;
                        files = (
                        dstSubfolderSpec = 0;
                        files = (
-                               818710510D5BE29300C7B441 /* psk.txt in CopyFiles */,
-                               8167917B0D650BAA006B523F /* racoon.conf in CopyFiles */,
+                               812530FC0D3FE9DC006BDF4F /* racoon.8 in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               812531210D3FEA33006BDF4F /* CopyFiles */ = {
+               812530FD0D3FE9DC006BDF4F /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
-                       dstPath = /usr/share/man/man8;
+                       dstPath = /usr/share/man/man5;
                        dstSubfolderSpec = 0;
                        files = (
                        dstSubfolderSpec = 0;
                        files = (
-                               812531220D3FEA33006BDF4F /* racoonctl.8 in CopyFiles */,
+                               812530FE0D3FE9DC006BDF4F /* racoon.conf.5 in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               815C35FC152522A900502220 /* CopyFiles */ = {
+               812530FF0D3FE9DC006BDF4F /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
-                       dstPath = /usr/local/OpenSourceVersions/;
+                       dstPath = /private/etc/racoon/remote;
                        dstSubfolderSpec = 0;
                        files = (
                        dstSubfolderSpec = 0;
                        files = (
-                               815C35FE152522CE00502220 /* ipsec.plist in CopyFiles */,
+                               818710530D5BE2B500C7B441 /* anonymous.conf in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               815C35FD152522AC00502220 /* CopyFiles */ = {
+               812531020D3FE9DC006BDF4F /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
-                       dstPath = /usr/local/OpenSourceLicenses;
+                       dstPath = /private/etc/racoon;
                        dstSubfolderSpec = 0;
                        files = (
                        dstSubfolderSpec = 0;
                        files = (
-                               815C35FF152522EB00502220 /* ipsec.txt in CopyFiles */,
+                               818710510D5BE29300C7B441 /* psk.txt in CopyFiles */,
+                               8167917B0D650BAA006B523F /* racoon.conf in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
@@ -579,13 +565,13 @@
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               BA64A932114EFE4400F3574C /* CopyFiles */ = {
+               BAA6806112B17CF900ACF6D3 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
-                       dstPath = /usr/local/share/sandbox/profiles/embedded/builtin;
+                       dstPath = /usr/local/OpenSourceLicenses;
                        dstSubfolderSpec = 0;
                        files = (
                        dstSubfolderSpec = 0;
                        files = (
-                               BA64A935114EFE9900F3574C /* racoon.sb in CopyFiles */,
+                               BACBF18C10290AE000BBFC85 /* ipsec.txt in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
@@ -619,7 +605,6 @@
                25EAE8C009D87B080042CC7F /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
                25F258050987FBFA00D15623 /* racoon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = racoon; sourceTree = BUILT_PRODUCTS_DIR; };
                25F2580A0987FC1500D15623 /* setkey */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = setkey; sourceTree = BUILT_PRODUCTS_DIR; };
                25EAE8C009D87B080042CC7F /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
                25F258050987FBFA00D15623 /* racoon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = racoon; sourceTree = BUILT_PRODUCTS_DIR; };
                25F2580A0987FC1500D15623 /* setkey */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = setkey; sourceTree = BUILT_PRODUCTS_DIR; };
-               25F2580F0987FC3400D15623 /* racoonctl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = racoonctl; sourceTree = BUILT_PRODUCTS_DIR; };
                25F258840988648C00D15623 /* extern.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = extern.h; sourceTree = "<group>"; };
                25F258870988648C00D15623 /* parse.y */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.yacc; path = parse.y; sourceTree = "<group>"; };
                25F258880988648C00D15623 /* scriptdump.pl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.perl; path = scriptdump.pl; sourceTree = "<group>"; };
                25F258840988648C00D15623 /* extern.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = extern.h; sourceTree = "<group>"; };
                25F258870988648C00D15623 /* parse.y */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.yacc; path = parse.y; sourceTree = "<group>"; };
                25F258880988648C00D15623 /* scriptdump.pl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.perl; path = scriptdump.pl; sourceTree = "<group>"; };
@@ -630,25 +615,9 @@
                25F25895098864AB00D15623 /* sample-policy01.cf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "sample-policy01.cf"; sourceTree = "<group>"; };
                25F25896098864AB00D15623 /* sample-policy02.cf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "sample-policy02.cf"; sourceTree = "<group>"; };
                25F25897098864AB00D15623 /* sample.cf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = sample.cf; sourceTree = "<group>"; };
                25F25895098864AB00D15623 /* sample-policy01.cf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "sample-policy01.cf"; sourceTree = "<group>"; };
                25F25896098864AB00D15623 /* sample-policy02.cf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "sample-policy02.cf"; sourceTree = "<group>"; };
                25F25897098864AB00D15623 /* sample.cf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = sample.cf; sourceTree = "<group>"; };
-               25F2589B098864F500D15623 /* FAQ */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = FAQ; sourceTree = "<group>"; };
-               25F2589C098864F500D15623 /* README.certificate */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README.certificate; sourceTree = "<group>"; };
-               25F2589D098864F500D15623 /* README.gssapi */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README.gssapi; sourceTree = "<group>"; };
-               25F2589E098864F500D15623 /* TODO */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; };
-               25F2589F0988651000D15623 /* boxes-fst.dat */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "boxes-fst.dat"; sourceTree = "<group>"; };
-               25F258A00988651000D15623 /* rijndael_local.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = rijndael_local.h; sourceTree = "<group>"; };
-               25F258A10988651000D15623 /* rijndael-alg-fst.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "rijndael-alg-fst.c"; sourceTree = "<group>"; };
-               25F258A20988651000D15623 /* rijndael-alg-fst.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "rijndael-alg-fst.h"; sourceTree = "<group>"; };
-               25F258A30988651000D15623 /* rijndael-api-fst.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "rijndael-api-fst.c"; sourceTree = "<group>"; };
-               25F258A40988651000D15623 /* rijndael-api-fst.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "rijndael-api-fst.h"; sourceTree = "<group>"; };
-               25F258A50988651000D15623 /* rijndael.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = rijndael.h; sourceTree = "<group>"; };
-               25F258AB0988657000D15623 /* admin_var.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = admin_var.h; sourceTree = "<group>"; };
-               25F258AC0988657000D15623 /* admin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = admin.c; sourceTree = "<group>"; };
-               25F258AD0988657000D15623 /* admin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = admin.h; sourceTree = "<group>"; };
                25F258AE0988657000D15623 /* algorithm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = algorithm.c; sourceTree = "<group>"; };
                25F258AF0988657000D15623 /* algorithm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = algorithm.h; sourceTree = "<group>"; };
                25F258B00988657000D15623 /* arc4random.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = arc4random.h; sourceTree = "<group>"; };
                25F258AE0988657000D15623 /* algorithm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = algorithm.c; sourceTree = "<group>"; };
                25F258AF0988657000D15623 /* algorithm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = algorithm.h; sourceTree = "<group>"; };
                25F258B00988657000D15623 /* arc4random.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = arc4random.h; sourceTree = "<group>"; };
-               25F258B10988657000D15623 /* backupsa.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = backupsa.c; sourceTree = "<group>"; };
-               25F258B20988657000D15623 /* backupsa.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = backupsa.h; sourceTree = "<group>"; };
                25F258B30988657000D15623 /* cfparse_proto.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cfparse_proto.h; sourceTree = "<group>"; };
                25F258B40988657000D15623 /* cfparse.y */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.yacc; path = cfparse.y; sourceTree = "<group>"; };
                25F258B50988657000D15623 /* cftoken_proto.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cftoken_proto.h; sourceTree = "<group>"; };
                25F258B30988657000D15623 /* cfparse_proto.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cfparse_proto.h; sourceTree = "<group>"; };
                25F258B40988657000D15623 /* cfparse.y */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.yacc; path = cfparse.y; sourceTree = "<group>"; };
                25F258B50988657000D15623 /* cftoken_proto.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cftoken_proto.h; sourceTree = "<group>"; };
@@ -658,30 +627,22 @@
                25F258B90988657000D15623 /* crypto_openssl.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = crypto_openssl.c; sourceTree = "<group>"; };
                25F258BA0988657000D15623 /* crypto_openssl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = crypto_openssl.h; sourceTree = "<group>"; };
                25F258BB0988657000D15623 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
                25F258B90988657000D15623 /* crypto_openssl.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = crypto_openssl.c; sourceTree = "<group>"; };
                25F258BA0988657000D15623 /* crypto_openssl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = crypto_openssl.h; sourceTree = "<group>"; };
                25F258BB0988657000D15623 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-               25F258BC0988657000D15623 /* debugrm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = debugrm.h; sourceTree = "<group>"; };
                25F258BD0988657000D15623 /* dhgroup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dhgroup.h; sourceTree = "<group>"; };
                25F258BE0988657000D15623 /* dnssec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = dnssec.c; sourceTree = "<group>"; };
                25F258BF0988657000D15623 /* dnssec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dnssec.h; sourceTree = "<group>"; };
                25F258C00988657000D15623 /* dump.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dump.h; sourceTree = "<group>"; };
                25F258BD0988657000D15623 /* dhgroup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dhgroup.h; sourceTree = "<group>"; };
                25F258BE0988657000D15623 /* dnssec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = dnssec.c; sourceTree = "<group>"; };
                25F258BF0988657000D15623 /* dnssec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dnssec.h; sourceTree = "<group>"; };
                25F258C00988657000D15623 /* dump.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dump.h; sourceTree = "<group>"; };
-               25F258C20988657000D15623 /* evt.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = evt.c; sourceTree = "<group>"; };
-               25F258C30988657000D15623 /* evt.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = evt.h; sourceTree = "<group>"; };
                25F258C40988657000D15623 /* gcmalloc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gcmalloc.h; sourceTree = "<group>"; };
                25F258C50988657000D15623 /* genlist.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = genlist.c; sourceTree = "<group>"; };
                25F258C60988657000D15623 /* genlist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = genlist.h; sourceTree = "<group>"; };
                25F258C70988657000D15623 /* getcertsbyname.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = getcertsbyname.c; sourceTree = "<group>"; };
                25F258C40988657000D15623 /* gcmalloc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gcmalloc.h; sourceTree = "<group>"; };
                25F258C50988657000D15623 /* genlist.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = genlist.c; sourceTree = "<group>"; };
                25F258C60988657000D15623 /* genlist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = genlist.h; sourceTree = "<group>"; };
                25F258C70988657000D15623 /* getcertsbyname.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = getcertsbyname.c; sourceTree = "<group>"; };
-               25F258C80988657000D15623 /* gnuc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gnuc.h; sourceTree = "<group>"; };
                25F258C90988657000D15623 /* grabmyaddr.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = grabmyaddr.c; sourceTree = "<group>"; };
                25F258CA0988657000D15623 /* grabmyaddr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = grabmyaddr.h; sourceTree = "<group>"; };
                25F258C90988657000D15623 /* grabmyaddr.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = grabmyaddr.c; sourceTree = "<group>"; };
                25F258CA0988657000D15623 /* grabmyaddr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = grabmyaddr.h; sourceTree = "<group>"; };
-               25F258CB0988657000D15623 /* gssapi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = gssapi.c; sourceTree = "<group>"; };
-               25F258CC0988657000D15623 /* gssapi.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gssapi.h; sourceTree = "<group>"; };
                25F258CD0988657000D15623 /* handler.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = handler.c; sourceTree = "<group>"; };
                25F258CE0988657000D15623 /* handler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = handler.h; sourceTree = "<group>"; };
                25F258CF0988657000D15623 /* ipsec_doi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ipsec_doi.c; sourceTree = "<group>"; };
                25F258D00988657000D15623 /* ipsec_doi.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ipsec_doi.h; sourceTree = "<group>"; };
                25F258D10988657000D15623 /* isakmp_agg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_agg.c; sourceTree = "<group>"; };
                25F258D20988657000D15623 /* isakmp_agg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isakmp_agg.h; sourceTree = "<group>"; };
                25F258CD0988657000D15623 /* handler.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = handler.c; sourceTree = "<group>"; };
                25F258CE0988657000D15623 /* handler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = handler.h; sourceTree = "<group>"; };
                25F258CF0988657000D15623 /* ipsec_doi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ipsec_doi.c; sourceTree = "<group>"; };
                25F258D00988657000D15623 /* ipsec_doi.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ipsec_doi.h; sourceTree = "<group>"; };
                25F258D10988657000D15623 /* isakmp_agg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_agg.c; sourceTree = "<group>"; };
                25F258D20988657000D15623 /* isakmp_agg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isakmp_agg.h; sourceTree = "<group>"; };
-               25F258D30988657000D15623 /* isakmp_base.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_base.c; sourceTree = "<group>"; };
-               25F258D40988657000D15623 /* isakmp_base.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isakmp_base.h; sourceTree = "<group>"; };
                25F258D50988657000D15623 /* isakmp_cfg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_cfg.c; sourceTree = "<group>"; };
                25F258D60988657000D15623 /* isakmp_cfg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isakmp_cfg.h; sourceTree = "<group>"; };
                25F258D70988657000D15623 /* isakmp_frag.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_frag.c; sourceTree = "<group>"; };
                25F258D50988657000D15623 /* isakmp_cfg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_cfg.c; sourceTree = "<group>"; };
                25F258D60988657000D15623 /* isakmp_cfg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isakmp_cfg.h; sourceTree = "<group>"; };
                25F258D70988657000D15623 /* isakmp_frag.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_frag.c; sourceTree = "<group>"; };
@@ -690,8 +651,6 @@
                25F258DA0988657000D15623 /* isakmp_ident.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isakmp_ident.h; sourceTree = "<group>"; };
                25F258DB0988657000D15623 /* isakmp_inf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_inf.c; sourceTree = "<group>"; };
                25F258DC0988657000D15623 /* isakmp_inf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isakmp_inf.h; sourceTree = "<group>"; };
                25F258DA0988657000D15623 /* isakmp_ident.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isakmp_ident.h; sourceTree = "<group>"; };
                25F258DB0988657000D15623 /* isakmp_inf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_inf.c; sourceTree = "<group>"; };
                25F258DC0988657000D15623 /* isakmp_inf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isakmp_inf.h; sourceTree = "<group>"; };
-               25F258DD0988657000D15623 /* isakmp_newg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_newg.c; sourceTree = "<group>"; };
-               25F258DE0988657000D15623 /* isakmp_newg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isakmp_newg.h; sourceTree = "<group>"; };
                25F258DF0988657000D15623 /* isakmp_quick.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_quick.c; sourceTree = "<group>"; };
                25F258E00988657000D15623 /* isakmp_quick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isakmp_quick.h; sourceTree = "<group>"; };
                25F258E10988657000D15623 /* isakmp_unity.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_unity.c; sourceTree = "<group>"; };
                25F258DF0988657000D15623 /* isakmp_quick.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_quick.c; sourceTree = "<group>"; };
                25F258E00988657000D15623 /* isakmp_quick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isakmp_quick.h; sourceTree = "<group>"; };
                25F258E10988657000D15623 /* isakmp_unity.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = isakmp_unity.c; sourceTree = "<group>"; };
@@ -704,8 +663,6 @@
                25F258E80988657000D15623 /* kmpstat.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = kmpstat.c; sourceTree = "<group>"; };
                25F258E90988657000D15623 /* localconf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = localconf.c; sourceTree = "<group>"; };
                25F258EA0988657000D15623 /* localconf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = localconf.h; sourceTree = "<group>"; };
                25F258E80988657000D15623 /* kmpstat.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = kmpstat.c; sourceTree = "<group>"; };
                25F258E90988657000D15623 /* localconf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = localconf.c; sourceTree = "<group>"; };
                25F258EA0988657000D15623 /* localconf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = localconf.h; sourceTree = "<group>"; };
-               25F258EB0988657000D15623 /* logger.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = logger.c; sourceTree = "<group>"; };
-               25F258EC0988657000D15623 /* logger.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = logger.h; sourceTree = "<group>"; };
                25F258ED0988657000D15623 /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
                25F258EE0988657000D15623 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = "<group>"; };
                25F258EF0988657000D15623 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = "<group>"; };
                25F258ED0988657000D15623 /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
                25F258EE0988657000D15623 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = "<group>"; };
                25F258EF0988657000D15623 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = "<group>"; };
@@ -722,15 +679,10 @@
                25F258FE0988657000D15623 /* plog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = plog.h; sourceTree = "<group>"; };
                25F258FF0988657000D15623 /* policy.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = policy.c; sourceTree = "<group>"; };
                25F259000988657000D15623 /* policy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = policy.h; sourceTree = "<group>"; };
                25F258FE0988657000D15623 /* plog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = plog.h; sourceTree = "<group>"; };
                25F258FF0988657000D15623 /* policy.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = policy.c; sourceTree = "<group>"; };
                25F259000988657000D15623 /* policy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = policy.h; sourceTree = "<group>"; };
-               25F259010988657000D15623 /* privsep.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = privsep.c; sourceTree = "<group>"; };
-               25F259020988657000D15623 /* privsep.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = privsep.h; sourceTree = "<group>"; };
                25F259030988657000D15623 /* proposal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = proposal.c; sourceTree = "<group>"; };
                25F259040988657000D15623 /* proposal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = proposal.h; sourceTree = "<group>"; };
                25F259090988657000D15623 /* racoon.8 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = racoon.8; sourceTree = "<group>"; };
                25F2590A0988657000D15623 /* racoon.conf.5 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = racoon.conf.5; sourceTree = "<group>"; };
                25F259030988657000D15623 /* proposal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = proposal.c; sourceTree = "<group>"; };
                25F259040988657000D15623 /* proposal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = proposal.h; sourceTree = "<group>"; };
                25F259090988657000D15623 /* racoon.8 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = racoon.8; sourceTree = "<group>"; };
                25F2590A0988657000D15623 /* racoon.conf.5 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = racoon.conf.5; sourceTree = "<group>"; };
-               25F2590B0988657000D15623 /* racoonctl.8 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = racoonctl.8; sourceTree = "<group>"; };
-               25F2590C0988657000D15623 /* racoonctl.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = racoonctl.c; sourceTree = "<group>"; };
-               25F2590D0988657000D15623 /* racoonctl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = racoonctl.h; sourceTree = "<group>"; };
                25F2590E0988657000D15623 /* remoteconf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = remoteconf.c; sourceTree = "<group>"; };
                25F2590F0988657000D15623 /* remoteconf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = remoteconf.h; sourceTree = "<group>"; };
                25F259120988657000D15623 /* safefile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = safefile.c; sourceTree = "<group>"; };
                25F2590E0988657000D15623 /* remoteconf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = remoteconf.c; sourceTree = "<group>"; };
                25F2590F0988657000D15623 /* remoteconf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = remoteconf.h; sourceTree = "<group>"; };
                25F259120988657000D15623 /* safefile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = safefile.c; sourceTree = "<group>"; };
@@ -757,11 +709,27 @@
                25F259270988657000D15623 /* vmbuf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = vmbuf.h; sourceTree = "<group>"; };
                25F777B909ABE3E100C99783 /* key_debug.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = key_debug.c; path = Common/key_debug.c; sourceTree = "<group>"; };
                25F777ED09ABE58400C99783 /* pfkey_dump.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pfkey_dump.c; path = Common/pfkey_dump.c; sourceTree = "<group>"; };
                25F259270988657000D15623 /* vmbuf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = vmbuf.h; sourceTree = "<group>"; };
                25F777B909ABE3E100C99783 /* key_debug.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = key_debug.c; path = Common/key_debug.c; sourceTree = "<group>"; };
                25F777ED09ABE58400C99783 /* pfkey_dump.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pfkey_dump.c; path = Common/pfkey_dump.c; sourceTree = "<group>"; };
+               6912CB6F1E78D96900631D9A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.0.Internal.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
+               6912CB711E78D97200631D9A /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.0.Internal.sdk/System/Library/Frameworks/CoreFoundation.framework; sourceTree = DEVELOPER_DIR; };
+               6912CB751E78DD7100631D9A /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.0.Internal.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
+               69BB7E341E777E3C009EE2BA /* racoon_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = racoon_test; sourceTree = BUILT_PRODUCTS_DIR; };
+               69BB7E351E777E3D009EE2BA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
                72265DDB0F818F9300730A7D /* ipsec.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = ipsec.plist; sourceTree = "<group>"; };
                72265DDB0F818F9300730A7D /* ipsec.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = ipsec.plist; sourceTree = "<group>"; };
+               723B6A2F162F7BE300895EE5 /* xpc_racoon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xpc_racoon.c; sourceTree = "<group>"; };
+               723B6A33162F7C1100895EE5 /* ipsec_xpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ipsec_xpc.h; sourceTree = "<group>"; };
                724F99500E3672FD00C56897 /* com.apple.racoon.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.racoon.plist; sourceTree = "<group>"; };
                724F99500E3672FD00C56897 /* com.apple.racoon.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.racoon.plist; sourceTree = "<group>"; };
+               7253CC601E7B3EAB00B2DDF5 /* racoon_certs_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = racoon_certs_data.h; path = "ipsec-tools/racoon_test/racoon_certs_data.h"; sourceTree = SOURCE_ROOT; };
+               7253CC611E7B3EAB00B2DDF5 /* racoon_test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = racoon_test.c; path = "ipsec-tools/racoon_test/racoon_test.c"; sourceTree = SOURCE_ROOT; };
+               7253CC621E7B3EB700B2DDF5 /* future_cert.der */ = {isa = PBXFileReference; lastKnownFileType = file; name = future_cert.der; path = "ipsec-tools/racoon_test/future_cert.der"; sourceTree = SOURCE_ROOT; };
+               7253CC631E7B3EB700B2DDF5 /* past_cert.der */ = {isa = PBXFileReference; lastKnownFileType = file; name = past_cert.der; path = "ipsec-tools/racoon_test/past_cert.der"; sourceTree = SOURCE_ROOT; };
+               7253CC641E7B3EB700B2DDF5 /* valid_cert.der */ = {isa = PBXFileReference; lastKnownFileType = file; name = valid_cert.der; path = "ipsec-tools/racoon_test/valid_cert.der"; sourceTree = SOURCE_ROOT; };
+               72F5C72D1607A1AE004C192F /* api_support.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = api_support.c; sourceTree = "<group>"; };
+               72F5C7311607A1DD004C192F /* api_support.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = api_support.h; sourceTree = "<group>"; };
+               7822D11D188DB07300874E91 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = ../../../../../System/Library/Frameworks/NetworkExtension.framework; sourceTree = "<group>"; };
+               7822D11F188DB07C00874E91 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.0.Internal.sdk/System/Library/Frameworks/NetworkExtension.framework; sourceTree = DEVELOPER_DIR; };
                8125310A0D3FE9DC006BDF4F /* racoon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = racoon; sourceTree = BUILT_PRODUCTS_DIR; };
                8125310A0D3FE9DC006BDF4F /* racoon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = racoon; sourceTree = BUILT_PRODUCTS_DIR; };
-               812531290D3FEA33006BDF4F /* racoonctl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = racoonctl; sourceTree = BUILT_PRODUCTS_DIR; };
                812A64EC0D4AA082004CB7EB /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = SDKs/Purple/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
                812A64EC0D4AA082004CB7EB /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = SDKs/Purple/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
+               81657D551457582300B8A054 /* racoon_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = racoon_types.h; sourceTree = "<group>"; };
                8176A6B80D45661700BC5251 /* libldap.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libldap.dylib; path = /usr/lib/libldap.dylib; sourceTree = "<absolute>"; };
                81856B700D6B8BC5001DAE21 /* algorithm_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = algorithm_types.h; sourceTree = "<group>"; };
                8187103A0D5BE18800C7B441 /* racoon.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = racoon.conf; path = Sample/Embedded/racoon.conf; sourceTree = "<group>"; };
                8176A6B80D45661700BC5251 /* libldap.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libldap.dylib; path = /usr/lib/libldap.dylib; sourceTree = "<absolute>"; };
                81856B700D6B8BC5001DAE21 /* algorithm_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = algorithm_types.h; sourceTree = "<group>"; };
                8187103A0D5BE18800C7B441 /* racoon.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = racoon.conf; path = Sample/Embedded/racoon.conf; sourceTree = "<group>"; };
@@ -771,6 +739,8 @@
                81C964580DA2CBEF00257BC8 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.0.Internal.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
                81C9645D0DA2CC2D00257BC8 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = /System/Library/Frameworks/SystemConfiguration.framework; sourceTree = "<absolute>"; };
                81CA08910CE3BC870055C0AF /* vpn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vpn.c; sourceTree = "<group>"; };
                81C964580DA2CBEF00257BC8 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.0.Internal.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
                81C9645D0DA2CC2D00257BC8 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = /System/Library/Frameworks/SystemConfiguration.framework; sourceTree = "<absolute>"; };
                81CA08910CE3BC870055C0AF /* vpn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vpn.c; sourceTree = "<group>"; };
+               81CBCFE71447A1680000D6E6 /* fsm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fsm.h; sourceTree = "<group>"; };
+               81CBCFE81447A1C20000D6E6 /* fsm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fsm.c; sourceTree = "<group>"; };
                81DDFDAA0D622C1700C5CB87 /* setkey */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = setkey; sourceTree = BUILT_PRODUCTS_DIR; };
                81DDFDCD0D622C2700C5CB87 /* libipsec.A.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libipsec.A.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                81EDB0670B5D8D7000840BC7 /* ipsec_dump_policy.3 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = ipsec_dump_policy.3; path = libipsec/ipsec_dump_policy.3; sourceTree = "<group>"; };
                81DDFDAA0D622C1700C5CB87 /* setkey */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = setkey; sourceTree = BUILT_PRODUCTS_DIR; };
                81DDFDCD0D622C2700C5CB87 /* libipsec.A.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libipsec.A.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                81EDB0670B5D8D7000840BC7 /* ipsec_dump_policy.3 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = ipsec_dump_policy.3; path = libipsec/ipsec_dump_policy.3; sourceTree = "<group>"; };
@@ -791,7 +761,8 @@
                BA6F10940EA1D67700546773 /* ike_session.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ike_session.h; sourceTree = "<group>"; };
                BA6F109A0EA1DEC200546773 /* ike_session.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ike_session.c; sourceTree = "<group>"; };
                BACBF18B10290AE000BBFC85 /* ipsec.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ipsec.txt; sourceTree = "<group>"; };
                BA6F10940EA1D67700546773 /* ike_session.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ike_session.h; sourceTree = "<group>"; };
                BA6F109A0EA1DEC200546773 /* ike_session.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ike_session.c; sourceTree = "<group>"; };
                BACBF18B10290AE000BBFC85 /* ipsec.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ipsec.txt; sourceTree = "<group>"; };
-               C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = AspenSDK.xcconfig; path = AppleInternal/XcodeConfig/AspenSDK.xcconfig; sourceTree = DEVELOPER_DIR; };
+               BACD8C681496A50C0042DEA1 /* Preferences.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Preferences.c; sourceTree = "<group>"; };
+               BACD8C691496A50C0042DEA1 /* Preferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Preferences.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -806,17 +777,13 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               7822D11E188DB07300874E91 /* NetworkExtension.framework in Frameworks */,
                                81C387570D45208700975D5E /* DirectoryService.framework in Frameworks */,
                                81C387560D45208700975D5E /* Security.framework in Frameworks */,
                                25EAE8C109D87B080042CC7F /* CoreFoundation.framework in Frameworks */,
                                8D5B16750E5F7F4E00E72675 /* libresolv.dylib in Frameworks */,
                                2537A1C709E49D0600D0ECDA /* libipsec.A.dylib in Frameworks */,
                                81C387570D45208700975D5E /* DirectoryService.framework in Frameworks */,
                                81C387560D45208700975D5E /* Security.framework in Frameworks */,
                                25EAE8C109D87B080042CC7F /* CoreFoundation.framework in Frameworks */,
                                8D5B16750E5F7F4E00E72675 /* libresolv.dylib in Frameworks */,
                                2537A1C709E49D0600D0ECDA /* libipsec.A.dylib in Frameworks */,
-                               25EAE84809D879700042CC7F /* libssl.dylib in Frameworks */,
-                               25EAE84B09D879DE0042CC7F /* libcrypto.dylib in Frameworks */,
-                               81C387890D4524F600975D5E /* libgssapi_krb5.dylib in Frameworks */,
-                               81C3877A0D4524E700975D5E /* libpam.dylib in Frameworks */,
                                25EAE87709D87A770042CC7F /* libiconv.dylib in Frameworks */,
                                25EAE87709D87A770042CC7F /* libiconv.dylib in Frameworks */,
-                               8176A6B90D45661700BC5251 /* libldap.dylib in Frameworks */,
                                81C9645F0DA2CC2D00257BC8 /* SystemConfiguration.framework in Frameworks */,
                                BA486225109C2BF500545E19 /* IOKit.framework in Frameworks */,
                        );
                                81C9645F0DA2CC2D00257BC8 /* SystemConfiguration.framework in Frameworks */,
                                BA486225109C2BF500545E19 /* IOKit.framework in Frameworks */,
                        );
@@ -830,11 +797,13 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               25F2580D0987FC3400D15623 /* Frameworks */ = {
+               69BB7E311E777E3C009EE2BA /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               2537A1CB09E49D5600D0ECDA /* libipsec.A.dylib in Frameworks */,
+                               6912CB761E78DD7100631D9A /* SystemConfiguration.framework in Frameworks */,
+                               6912CB721E78D97200631D9A /* CoreFoundation.framework in Frameworks */,
+                               6912CB701E78D96900631D9A /* Security.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -842,6 +811,7 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               7822D120188DB07C00874E91 /* NetworkExtension.framework in Frameworks */,
                                8D5B167D0E5F7F9F00E72675 /* libresolv.dylib in Frameworks */,
                                817FFC4E0D6134A7004A8DD8 /* libipsec.A.dylib in Frameworks */,
                                812530F80D3FE9DC006BDF4F /* libiconv.dylib in Frameworks */,
                                8D5B167D0E5F7F9F00E72675 /* libresolv.dylib in Frameworks */,
                                817FFC4E0D6134A7004A8DD8 /* libipsec.A.dylib in Frameworks */,
                                812530F80D3FE9DC006BDF4F /* libiconv.dylib in Frameworks */,
@@ -853,14 +823,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               8125311F0D3FEA33006BDF4F /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               817FFC5A0D613729004A8DD8 /* libipsec.A.dylib in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                81DDFDA10D622C1700C5CB87 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                81DDFDA10D622C1700C5CB87 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
@@ -885,7 +847,6 @@
                                BA64A933114EFE5C00F3574C /* racoon.sb */,
                                BACBF18B10290AE000BBFC85 /* ipsec.txt */,
                                72265DDB0F818F9300730A7D /* ipsec.plist */,
                                BA64A933114EFE5C00F3574C /* racoon.sb */,
                                BACBF18B10290AE000BBFC85 /* ipsec.txt */,
                                72265DDB0F818F9300730A7D /* ipsec.plist */,
-                               C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */,
                                25E5E82D0981A61900F2834C /* ipsec-tools */,
                                2589CB5409D8AE95002DC960 /* Libraries */,
                                25D3DB4C098998230025F703 /* Frameworks */,
                                25E5E82D0981A61900F2834C /* ipsec-tools */,
                                2589CB5409D8AE95002DC960 /* Libraries */,
                                25D3DB4C098998230025F703 /* Frameworks */,
@@ -898,12 +859,11 @@
                        children = (
                                25F258050987FBFA00D15623 /* racoon */,
                                25F2580A0987FC1500D15623 /* setkey */,
                        children = (
                                25F258050987FBFA00D15623 /* racoon */,
                                25F2580A0987FC1500D15623 /* setkey */,
-                               25F2580F0987FC3400D15623 /* racoonctl */,
                                2537A1A809E4864800D0ECDA /* libipsec.A.dylib */,
                                8125310A0D3FE9DC006BDF4F /* racoon */,
                                2537A1A809E4864800D0ECDA /* libipsec.A.dylib */,
                                8125310A0D3FE9DC006BDF4F /* racoon */,
-                               812531290D3FEA33006BDF4F /* racoonctl */,
                                81DDFDAA0D622C1700C5CB87 /* setkey */,
                                81DDFDCD0D622C2700C5CB87 /* libipsec.A.dylib */,
                                81DDFDAA0D622C1700C5CB87 /* setkey */,
                                81DDFDCD0D622C2700C5CB87 /* libipsec.A.dylib */,
+                               69BB7E341E777E3C009EE2BA /* racoon_test */,
                        );
                        name = Products;
                        sourceTree = "<group>";
                        );
                        name = Products;
                        sourceTree = "<group>";
@@ -943,6 +903,11 @@
                25D3DB4C098998230025F703 /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
                25D3DB4C098998230025F703 /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
+                               6912CB751E78DD7100631D9A /* SystemConfiguration.framework */,
+                               6912CB711E78D97200631D9A /* CoreFoundation.framework */,
+                               6912CB6F1E78D96900631D9A /* Security.framework */,
+                               7822D11F188DB07C00874E91 /* NetworkExtension.framework */,
+                               7822D11D188DB07300874E91 /* NetworkExtension.framework */,
                                81C964580DA2CBEF00257BC8 /* SystemConfiguration.framework */,
                                81C9645D0DA2CC2D00257BC8 /* SystemConfiguration.framework */,
                                812A64EC0D4AA082004CB7EB /* Security.framework */,
                                81C964580DA2CBEF00257BC8 /* SystemConfiguration.framework */,
                                81C9645D0DA2CC2D00257BC8 /* SystemConfiguration.framework */,
                                812A64EC0D4AA082004CB7EB /* Security.framework */,
@@ -950,6 +915,7 @@
                                25EAE83709D875BF0042CC7F /* DirectoryService.framework */,
                                25EAE8C009D87B080042CC7F /* CoreFoundation.framework */,
                                BA48611B109C2BBA00545E19 /* IOKit.framework */,
                                25EAE83709D875BF0042CC7F /* DirectoryService.framework */,
                                25EAE8C009D87B080042CC7F /* CoreFoundation.framework */,
                                BA48611B109C2BBA00545E19 /* IOKit.framework */,
+                               69BB7E351E777E3D009EE2BA /* Foundation.framework */,
                        );
                        name = Frameworks;
                        sourceTree = "<group>";
                        );
                        name = Frameworks;
                        sourceTree = "<group>";
@@ -974,6 +940,7 @@
                                25D3DB1B098996310025F703 /* libipsec */,
                                25F258000987FB1600D15623 /* racoon */,
                                25F257FF0987FB0E00D15623 /* setkey */,
                                25D3DB1B098996310025F703 /* libipsec */,
                                25F258000987FB1600D15623 /* racoon */,
                                25F257FF0987FB0E00D15623 /* setkey */,
+                               69BB7E2F1E777DEB009EE2BA /* Tests */,
                        );
                        path = "ipsec-tools";
                        sourceTree = "<group>";
                        );
                        path = "ipsec-tools";
                        sourceTree = "<group>";
@@ -999,21 +966,10 @@
                25F258000987FB1600D15623 /* racoon */ = {
                        isa = PBXGroup;
                        children = (
                25F258000987FB1600D15623 /* racoon */ = {
                        isa = PBXGroup;
                        children = (
-                               BA5B6F280EC19F40003774E7 /* ipsecConfigTracer.c */,
-                               BA5B6F360EC1A03C003774E7 /* ipsecConfigTracer.h */,
-                               BA5B6F290EC19F40003774E7 /* ipsecSessionTracer.c */,
-                               BA5B6F370EC1A03C003774E7 /* ipsecSessionTracer.h */,
-                               BA6F109A0EA1DEC200546773 /* ike_session.c */,
-                               BA6F10940EA1D67700546773 /* ike_session.h */,
-                               25F258AB0988657000D15623 /* admin_var.h */,
-                               25F258AC0988657000D15623 /* admin.c */,
-                               25F258AD0988657000D15623 /* admin.h */,
                                25F258AE0988657000D15623 /* algorithm.c */,
                                81856B700D6B8BC5001DAE21 /* algorithm_types.h */,
                                25F258AF0988657000D15623 /* algorithm.h */,
                                25F258B00988657000D15623 /* arc4random.h */,
                                25F258AE0988657000D15623 /* algorithm.c */,
                                81856B700D6B8BC5001DAE21 /* algorithm_types.h */,
                                25F258AF0988657000D15623 /* algorithm.h */,
                                25F258B00988657000D15623 /* arc4random.h */,
-                               25F258B10988657000D15623 /* backupsa.c */,
-                               25F258B20988657000D15623 /* backupsa.h */,
                                25F258B30988657000D15623 /* cfparse_proto.h */,
                                25F258B40988657000D15623 /* cfparse.y */,
                                25F258B50988657000D15623 /* cftoken_proto.h */,
                                25F258B30988657000D15623 /* cfparse_proto.h */,
                                25F258B40988657000D15623 /* cfparse.y */,
                                25F258B50988657000D15623 /* cftoken_proto.h */,
@@ -1024,30 +980,30 @@
                                25F258B90988657000D15623 /* crypto_openssl.c */,
                                25F258BA0988657000D15623 /* crypto_openssl.h */,
                                25F258BB0988657000D15623 /* debug.h */,
                                25F258B90988657000D15623 /* crypto_openssl.c */,
                                25F258BA0988657000D15623 /* crypto_openssl.h */,
                                25F258BB0988657000D15623 /* debug.h */,
-                               25F258BC0988657000D15623 /* debugrm.h */,
                                25F258BD0988657000D15623 /* dhgroup.h */,
                                25F258BE0988657000D15623 /* dnssec.c */,
                                25F258BF0988657000D15623 /* dnssec.h */,
                                25F258C00988657000D15623 /* dump.h */,
                                25F258BD0988657000D15623 /* dhgroup.h */,
                                25F258BE0988657000D15623 /* dnssec.c */,
                                25F258BF0988657000D15623 /* dnssec.h */,
                                25F258C00988657000D15623 /* dump.h */,
-                               25F258C20988657000D15623 /* evt.c */,
-                               25F258C30988657000D15623 /* evt.h */,
+                               81CBCFE81447A1C20000D6E6 /* fsm.c */,
+                               81CBCFE71447A1680000D6E6 /* fsm.h */,
                                25F258C40988657000D15623 /* gcmalloc.h */,
                                25F258C50988657000D15623 /* genlist.c */,
                                25F258C60988657000D15623 /* genlist.h */,
                                25F258C70988657000D15623 /* getcertsbyname.c */,
                                25F258C40988657000D15623 /* gcmalloc.h */,
                                25F258C50988657000D15623 /* genlist.c */,
                                25F258C60988657000D15623 /* genlist.h */,
                                25F258C70988657000D15623 /* getcertsbyname.c */,
-                               25F258C80988657000D15623 /* gnuc.h */,
                                25F258C90988657000D15623 /* grabmyaddr.c */,
                                25F258CA0988657000D15623 /* grabmyaddr.h */,
                                25F258C90988657000D15623 /* grabmyaddr.c */,
                                25F258CA0988657000D15623 /* grabmyaddr.h */,
-                               25F258CB0988657000D15623 /* gssapi.c */,
-                               25F258CC0988657000D15623 /* gssapi.h */,
                                25F258CD0988657000D15623 /* handler.c */,
                                25F258CE0988657000D15623 /* handler.h */,
                                25F258CD0988657000D15623 /* handler.c */,
                                25F258CE0988657000D15623 /* handler.h */,
+                               BA6F109A0EA1DEC200546773 /* ike_session.c */,
+                               BA6F10940EA1D67700546773 /* ike_session.h */,
                                25F258CF0988657000D15623 /* ipsec_doi.c */,
                                25F258D00988657000D15623 /* ipsec_doi.h */,
                                25F258CF0988657000D15623 /* ipsec_doi.c */,
                                25F258D00988657000D15623 /* ipsec_doi.h */,
+                               BA5B6F280EC19F40003774E7 /* ipsecConfigTracer.c */,
+                               BA5B6F360EC1A03C003774E7 /* ipsecConfigTracer.h */,
+                               BA5B6F290EC19F40003774E7 /* ipsecSessionTracer.c */,
+                               BA5B6F370EC1A03C003774E7 /* ipsecSessionTracer.h */,
                                25F258D10988657000D15623 /* isakmp_agg.c */,
                                25F258D20988657000D15623 /* isakmp_agg.h */,
                                25F258D10988657000D15623 /* isakmp_agg.c */,
                                25F258D20988657000D15623 /* isakmp_agg.h */,
-                               25F258D30988657000D15623 /* isakmp_base.c */,
-                               25F258D40988657000D15623 /* isakmp_base.h */,
                                25F258D50988657000D15623 /* isakmp_cfg.c */,
                                25F258D60988657000D15623 /* isakmp_cfg.h */,
                                25F258D70988657000D15623 /* isakmp_frag.c */,
                                25F258D50988657000D15623 /* isakmp_cfg.c */,
                                25F258D60988657000D15623 /* isakmp_cfg.h */,
                                25F258D70988657000D15623 /* isakmp_frag.c */,
@@ -1056,8 +1012,6 @@
                                25F258DA0988657000D15623 /* isakmp_ident.h */,
                                25F258DB0988657000D15623 /* isakmp_inf.c */,
                                25F258DC0988657000D15623 /* isakmp_inf.h */,
                                25F258DA0988657000D15623 /* isakmp_ident.h */,
                                25F258DB0988657000D15623 /* isakmp_inf.c */,
                                25F258DC0988657000D15623 /* isakmp_inf.h */,
-                               25F258DD0988657000D15623 /* isakmp_newg.c */,
-                               25F258DE0988657000D15623 /* isakmp_newg.h */,
                                25F258DF0988657000D15623 /* isakmp_quick.c */,
                                25F258E00988657000D15623 /* isakmp_quick.h */,
                                25F258E10988657000D15623 /* isakmp_unity.c */,
                                25F258DF0988657000D15623 /* isakmp_quick.c */,
                                25F258E00988657000D15623 /* isakmp_quick.h */,
                                25F258E10988657000D15623 /* isakmp_unity.c */,
@@ -1070,8 +1024,6 @@
                                25F258E80988657000D15623 /* kmpstat.c */,
                                25F258E90988657000D15623 /* localconf.c */,
                                25F258EA0988657000D15623 /* localconf.h */,
                                25F258E80988657000D15623 /* kmpstat.c */,
                                25F258E90988657000D15623 /* localconf.c */,
                                25F258EA0988657000D15623 /* localconf.h */,
-                               25F258EB0988657000D15623 /* logger.c */,
-                               25F258EC0988657000D15623 /* logger.h */,
                                25F258ED0988657000D15623 /* main.c */,
                                25F258EE0988657000D15623 /* misc.c */,
                                25F258EF0988657000D15623 /* misc.h */,
                                25F258ED0988657000D15623 /* main.c */,
                                25F258EE0988657000D15623 /* misc.c */,
                                25F258EF0988657000D15623 /* misc.h */,
@@ -1090,15 +1042,13 @@
                                25F259000988657000D15623 /* policy.h */,
                                BA485FA1109C1ECA00545E19 /* power_mgmt.c */,
                                BA485FA6109C243900545E19 /* power_mgmt.h */,
                                25F259000988657000D15623 /* policy.h */,
                                BA485FA1109C1ECA00545E19 /* power_mgmt.c */,
                                BA485FA6109C243900545E19 /* power_mgmt.h */,
-                               25F259010988657000D15623 /* privsep.c */,
-                               25F259020988657000D15623 /* privsep.h */,
+                               BACD8C681496A50C0042DEA1 /* Preferences.c */,
+                               BACD8C691496A50C0042DEA1 /* Preferences.h */,
                                25F259030988657000D15623 /* proposal.c */,
                                25F259040988657000D15623 /* proposal.h */,
                                25F259090988657000D15623 /* racoon.8 */,
                                25F2590A0988657000D15623 /* racoon.conf.5 */,
                                25F259030988657000D15623 /* proposal.c */,
                                25F259040988657000D15623 /* proposal.h */,
                                25F259090988657000D15623 /* racoon.8 */,
                                25F2590A0988657000D15623 /* racoon.conf.5 */,
-                               25F2590B0988657000D15623 /* racoonctl.8 */,
-                               25F2590C0988657000D15623 /* racoonctl.c */,
-                               25F2590D0988657000D15623 /* racoonctl.h */,
+                               81657D551457582300B8A054 /* racoon_types.h */,
                                25F2590E0988657000D15623 /* remoteconf.c */,
                                25F2590F0988657000D15623 /* remoteconf.h */,
                                25F259120988657000D15623 /* safefile.c */,
                                25F2590E0988657000D15623 /* remoteconf.c */,
                                25F2590F0988657000D15623 /* remoteconf.h */,
                                25F259120988657000D15623 /* safefile.c */,
@@ -1128,9 +1078,11 @@
                                25DE2DE70A8BD40E0010A46D /* vpn_control.h */,
                                81CA08910CE3BC870055C0AF /* vpn.c */,
                                BA5B6F4F0EC1A136003774E7 /* vpn.h */,
                                25DE2DE70A8BD40E0010A46D /* vpn_control.h */,
                                81CA08910CE3BC870055C0AF /* vpn.c */,
                                BA5B6F4F0EC1A136003774E7 /* vpn.h */,
+                               72F5C72D1607A1AE004C192F /* api_support.c */,
+                               72F5C7311607A1DD004C192F /* api_support.h */,
+                               723B6A2F162F7BE300895EE5 /* xpc_racoon.c */,
+                               723B6A33162F7C1100895EE5 /* ipsec_xpc.h */,
                                818710380D5BE15400C7B441 /* Sample */,
                                818710380D5BE15400C7B441 /* Sample */,
-                               25F2584D098861F500D15623 /* Documents */,
-                               25F2584C098861ED00D15623 /* Crypto */,
                        );
                        path = racoon;
                        sourceTree = "<group>";
                        );
                        path = racoon;
                        sourceTree = "<group>";
@@ -1145,29 +1097,41 @@
                        path = Sample;
                        sourceTree = "<group>";
                };
                        path = Sample;
                        sourceTree = "<group>";
                };
-               25F2584C098861ED00D15623 /* Crypto */ = {
+               69983DB81E7B1BC6007683BF /* Source */ = {
+                       isa = PBXGroup;
+                       children = (
+                               7253CC601E7B3EAB00B2DDF5 /* racoon_certs_data.h */,
+                               7253CC611E7B3EAB00B2DDF5 /* racoon_test.c */,
+                       );
+                       path = Source;
+                       sourceTree = "<group>";
+               };
+               69983DB91E7B1BCE007683BF /* Support */ = {
+                       isa = PBXGroup;
+                       children = (
+                               7253CC621E7B3EB700B2DDF5 /* future_cert.der */,
+                               7253CC631E7B3EB700B2DDF5 /* past_cert.der */,
+                               7253CC641E7B3EB700B2DDF5 /* valid_cert.der */,
+                       );
+                       path = Support;
+                       sourceTree = "<group>";
+               };
+               69BB7E2F1E777DEB009EE2BA /* Tests */ = {
                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (
-                               25F2589F0988651000D15623 /* boxes-fst.dat */,
-                               25F258A00988651000D15623 /* rijndael_local.h */,
-                               25F258A10988651000D15623 /* rijndael-alg-fst.c */,
-                               25F258A20988651000D15623 /* rijndael-alg-fst.h */,
-                               25F258A30988651000D15623 /* rijndael-api-fst.c */,
-                               25F258A40988651000D15623 /* rijndael-api-fst.h */,
-                               25F258A50988651000D15623 /* rijndael.h */,
-                       );
-                       path = Crypto;
+                               69BB7E371E777E3D009EE2BA /* racoon_test */,
+                       );
+                       path = Tests;
                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };
-               25F2584D098861F500D15623 /* Documents */ = {
+               69BB7E371E777E3D009EE2BA /* racoon_test */ = {
                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (
-                               25F2589B098864F500D15623 /* FAQ */,
-                               25F2589C098864F500D15623 /* README.certificate */,
-                               25F2589D098864F500D15623 /* README.gssapi */,
-                               25F2589E098864F500D15623 /* TODO */,
+                               69983DB81E7B1BC6007683BF /* Source */,
+                               69983DB91E7B1BCE007683BF /* Support */,
                        );
                        );
-                       path = Documents;
+                       name = racoon_test;
+                       path = ../../racoon_test;
                        sourceTree = "<group>";
                };
                818710380D5BE15400C7B441 /* Sample */ = {
                        sourceTree = "<group>";
                };
                818710380D5BE15400C7B441 /* Sample */ = {
@@ -1248,7 +1212,6 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (
-                               2537A1C909E49D1400D0ECDA /* PBXTargetDependency */,
                        );
                        name = racoon;
                        productName = racoon;
                        );
                        name = racoon;
                        productName = racoon;
@@ -1267,30 +1230,27 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (
-                               2537A1C309E494D300D0ECDA /* PBXTargetDependency */,
                        );
                        name = setkey;
                        productName = setkey;
                        productReference = 25F2580A0987FC1500D15623 /* setkey */;
                        productType = "com.apple.product-type.tool";
                };
                        );
                        name = setkey;
                        productName = setkey;
                        productReference = 25F2580A0987FC1500D15623 /* setkey */;
                        productType = "com.apple.product-type.tool";
                };
-               25F2580E0987FC3400D15623 /* racoonctl */ = {
+               69BB7E331E777E3C009EE2BA /* racoon_test */ = {
                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;
-                       buildConfigurationList = 25D3DAC4098952B20025F703 /* Build configuration list for PBXNativeTarget "racoonctl" */;
+                       buildConfigurationList = 69BB7E3C1E777E3D009EE2BA /* Build configuration list for PBXNativeTarget "racoon_test" */;
                        buildPhases = (
                        buildPhases = (
-                               25F2580C0987FC3400D15623 /* Sources */,
-                               25F2580D0987FC3400D15623 /* Frameworks */,
-                               258CF2D50A191A6E00166B38 /* CopyFiles */,
-                               258CF31E0A19432A00166B38 /* ShellScript */,
+                               69BB7E301E777E3C009EE2BA /* Sources */,
+                               69BB7E311E777E3C009EE2BA /* Frameworks */,
+                               69BB7E321E777E3C009EE2BA /* CopyFiles */,
                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        buildRules = (
                        );
                        dependencies = (
-                               2537A1CD09E49D5C00D0ECDA /* PBXTargetDependency */,
                        );
                        );
-                       name = racoonctl;
-                       productName = racoonctl;
-                       productReference = 25F2580F0987FC3400D15623 /* racoonctl */;
+                       name = racoon_test;
+                       productName = racoon_test;
+                       productReference = 69BB7E341E777E3C009EE2BA /* racoon_test */;
                        productType = "com.apple.product-type.tool";
                };
                812530BA0D3FE9DC006BDF4F /* racoon Embedded */ = {
                        productType = "com.apple.product-type.tool";
                };
                812530BA0D3FE9DC006BDF4F /* racoon Embedded */ = {
@@ -1304,38 +1264,18 @@
                                812530FF0D3FE9DC006BDF4F /* CopyFiles */,
                                812531020D3FE9DC006BDF4F /* CopyFiles */,
                                725F453B0E36A15C005BB55C /* CopyFiles */,
                                812530FF0D3FE9DC006BDF4F /* CopyFiles */,
                                812531020D3FE9DC006BDF4F /* CopyFiles */,
                                725F453B0E36A15C005BB55C /* CopyFiles */,
-                               BA64A932114EFE4400F3574C /* CopyFiles */,
                                812531040D3FE9DC006BDF4F /* ShellScript */,
                                834072BB0EDCC5C400B6CCE8 /* CopyFiles */,
                        );
                        buildRules = (
                        );
                        dependencies = (
                                812531040D3FE9DC006BDF4F /* ShellScript */,
                                834072BB0EDCC5C400B6CCE8 /* CopyFiles */,
                        );
                        buildRules = (
                        );
                        dependencies = (
-                               81DDFDDF0D622D1700C5CB87 /* PBXTargetDependency */,
                        );
                        name = "racoon Embedded";
                        productName = racoon;
                        productReference = 8125310A0D3FE9DC006BDF4F /* racoon */;
                        productType = "com.apple.product-type.tool";
                };
                        );
                        name = "racoon Embedded";
                        productName = racoon;
                        productReference = 8125310A0D3FE9DC006BDF4F /* racoon */;
                        productType = "com.apple.product-type.tool";
                };
-               812531120D3FEA33006BDF4F /* racoonctl Embedded */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 812531240D3FEA33006BDF4F /* Build configuration list for PBXNativeTarget "racoonctl Embedded" */;
-                       buildPhases = (
-                               812531150D3FEA33006BDF4F /* Sources */,
-                               8125311F0D3FEA33006BDF4F /* Frameworks */,
-                               812531210D3FEA33006BDF4F /* CopyFiles */,
-                               812531230D3FEA33006BDF4F /* ShellScript */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = "racoonctl Embedded";
-                       productName = racoonctl;
-                       productReference = 812531290D3FEA33006BDF4F /* racoonctl */;
-                       productType = "com.apple.product-type.tool";
-               };
                81DDFD970D622C1700C5CB87 /* setkey Embedded */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 81DDFDA60D622C1700C5CB87 /* Build configuration list for PBXNativeTarget "setkey Embedded" */;
                81DDFD970D622C1700C5CB87 /* setkey Embedded */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 81DDFDA60D622C1700C5CB87 /* Build configuration list for PBXNativeTarget "setkey Embedded" */;
@@ -1348,7 +1288,6 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (
-                               81DDFDE40D622D8C00C5CB87 /* PBXTargetDependency */,
                        );
                        name = "setkey Embedded";
                        productName = setkey;
                        );
                        name = "setkey Embedded";
                        productName = setkey;
@@ -1379,8 +1318,17 @@
 /* Begin PBXProject section */
                23D2D790087071FC00C51098 /* Project object */ = {
                        isa = PBXProject;
 /* Begin PBXProject section */
                23D2D790087071FC00C51098 /* Project object */ = {
                        isa = PBXProject;
+                       attributes = {
+                               LastUpgradeCheck = 0430;
+                               TargetAttributes = {
+                                       69BB7E331E777E3C009EE2BA = {
+                                               CreatedOnToolsVersion = 9.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                               };
+                       };
                        buildConfigurationList = 25D3DACC098952B20025F703 /* Build configuration list for PBXProject "ipsec" */;
                        buildConfigurationList = 25D3DACC098952B20025F703 /* Build configuration list for PBXProject "ipsec" */;
-                       compatibilityVersion = "Xcode 3.0";
+                       compatibilityVersion = "Xcode 3.2";
                        developmentRegion = English;
                        hasScannedForEncodings = 0;
                        knownRegions = (
                        developmentRegion = English;
                        hasScannedForEncodings = 0;
                        knownRegions = (
@@ -1395,17 +1343,18 @@
                        projectRoot = "";
                        targets = (
                                23B20D2F0871D62A00A3B0FC /* IPSec (Aggregate) */,
                        projectRoot = "";
                        targets = (
                                23B20D2F0871D62A00A3B0FC /* IPSec (Aggregate) */,
-                               815C35E61525201900502220 /* Project_base */,
-                               815C35EB1525203F00502220 /* Project_executables */,
+                               72B3C2081684F5C4004E4548 /* ipsec_executables */,
+                               72B3C21116850B87004E4548 /* ipsec_libraries */,
                                25F258040987FBFA00D15623 /* racoon */,
                                25F258040987FBFA00D15623 /* racoon */,
-                               25F2580E0987FC3400D15623 /* racoonctl */,
                                25F258090987FC1500D15623 /* setkey */,
                                2537A1A709E4864800D0ECDA /* libipsec */,
                                812530AA0D3FE994006BDF4F /* IPSec Embedded (Aggregate) */,
                                25F258090987FC1500D15623 /* setkey */,
                                2537A1A709E4864800D0ECDA /* libipsec */,
                                812530AA0D3FE994006BDF4F /* IPSec Embedded (Aggregate) */,
+                               78C83A09189841FA00DB2F64 /* ipsec_executables_embedded */,
+                               78C83A04189841E800DB2F64 /* ipsec_libraries_embedded */,
                                812530BA0D3FE9DC006BDF4F /* racoon Embedded */,
                                812530BA0D3FE9DC006BDF4F /* racoon Embedded */,
-                               812531120D3FEA33006BDF4F /* racoonctl Embedded */,
                                81DDFD970D622C1700C5CB87 /* setkey Embedded */,
                                81DDFDB80D622C2700C5CB87 /* libipsec Embedded */,
                                81DDFD970D622C1700C5CB87 /* setkey Embedded */,
                                81DDFDB80D622C2700C5CB87 /* libipsec Embedded */,
+                               69BB7E331E777E3C009EE2BA /* racoon_test */,
                        );
                };
 /* End PBXProject section */
                        );
                };
 /* End PBXProject section */
@@ -1424,19 +1373,6 @@
                        shellPath = /bin/sh;
                        shellScript = "/bin/chmod 600 $DSTROOT/private/etc/racoon/psk.txt\n/bin/chmod 644 $DSTROOT/private/etc/racoon/racoon.conf\n/bin/chmod 600 $DSTROOT/private/etc/racoon/remote/anonymous.conf\n/bin/chmod 444 $DSTROOT/usr/share/man/man5/racoon.conf.5\n/bin/chmod 444 $DSTROOT/usr/share/man/man8/racoon.8\n";
                };
                        shellPath = /bin/sh;
                        shellScript = "/bin/chmod 600 $DSTROOT/private/etc/racoon/psk.txt\n/bin/chmod 644 $DSTROOT/private/etc/racoon/racoon.conf\n/bin/chmod 600 $DSTROOT/private/etc/racoon/remote/anonymous.conf\n/bin/chmod 444 $DSTROOT/usr/share/man/man5/racoon.conf.5\n/bin/chmod 444 $DSTROOT/usr/share/man/man8/racoon.8\n";
                };
-               258CF31E0A19432A00166B38 /* ShellScript */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 8;
-                       files = (
-                       );
-                       inputPaths = (
-                       );
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
-                       shellPath = /bin/sh;
-                       shellScript = "/bin/chmod 444 $DSTROOT/usr/share/man/man8/racoonctl.8";
-               };
                258CF3200A19435B00166B38 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                258CF3200A19435B00166B38 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
@@ -1476,19 +1412,6 @@
                        shellPath = /bin/sh;
                        shellScript = "/bin/chmod 600 $DSTROOT/private/etc/racoon/psk.txt\n/bin/chmod 644 $DSTROOT/private/etc/racoon/racoon.conf\n/bin/chmod 600 $DSTROOT/private/etc/racoon/remote/anonymous.conf\n/bin/chmod 444 $DSTROOT/usr/share/man/man5/racoon.conf.5\n/bin/chmod 444 $DSTROOT/usr/share/man/man8/racoon.8\n";
                };
                        shellPath = /bin/sh;
                        shellScript = "/bin/chmod 600 $DSTROOT/private/etc/racoon/psk.txt\n/bin/chmod 644 $DSTROOT/private/etc/racoon/racoon.conf\n/bin/chmod 600 $DSTROOT/private/etc/racoon/remote/anonymous.conf\n/bin/chmod 444 $DSTROOT/usr/share/man/man5/racoon.conf.5\n/bin/chmod 444 $DSTROOT/usr/share/man/man8/racoon.8\n";
                };
-               812531230D3FEA33006BDF4F /* ShellScript */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 8;
-                       files = (
-                       );
-                       inputPaths = (
-                       );
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
-                       shellPath = /bin/sh;
-                       shellScript = "/bin/chmod 444 $DSTROOT/usr/share/man/man8/racoonctl.8";
-               };
                81DDFDA50D622C1700C5CB87 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                81DDFDA50D622C1700C5CB87 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
@@ -1534,31 +1457,24 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               25F259280988657000D15623 /* admin.c in Sources */,
                                25F259290988657000D15623 /* algorithm.c in Sources */,
                                25F259290988657000D15623 /* algorithm.c in Sources */,
-                               25F2592A0988657000D15623 /* backupsa.c in Sources */,
                                25F2592B0988657000D15623 /* cfparse.y in Sources */,
                                25F2592C0988657000D15623 /* cftoken.l in Sources */,
                                81C386AA0D451EC300975D5E /* crypto_cssm.c in Sources */,
                                25F2592E0988657000D15623 /* crypto_openssl.c in Sources */,
                                25F2592F0988657000D15623 /* dnssec.c in Sources */,
                                25F2592B0988657000D15623 /* cfparse.y in Sources */,
                                25F2592C0988657000D15623 /* cftoken.l in Sources */,
                                81C386AA0D451EC300975D5E /* crypto_cssm.c in Sources */,
                                25F2592E0988657000D15623 /* crypto_openssl.c in Sources */,
                                25F2592F0988657000D15623 /* dnssec.c in Sources */,
-                               25F259310988657000D15623 /* evt.c in Sources */,
                                25F259320988657000D15623 /* genlist.c in Sources */,
                                25F259330988657000D15623 /* getcertsbyname.c in Sources */,
                                25F259340988657000D15623 /* grabmyaddr.c in Sources */,
                                25F259320988657000D15623 /* genlist.c in Sources */,
                                25F259330988657000D15623 /* getcertsbyname.c in Sources */,
                                25F259340988657000D15623 /* grabmyaddr.c in Sources */,
-                               25F259350988657000D15623 /* gssapi.c in Sources */,
                                25F259360988657000D15623 /* handler.c in Sources */,
                                25F259370988657000D15623 /* ipsec_doi.c in Sources */,
                                25F259380988657000D15623 /* isakmp_agg.c in Sources */,
                                25F259360988657000D15623 /* handler.c in Sources */,
                                25F259370988657000D15623 /* ipsec_doi.c in Sources */,
                                25F259380988657000D15623 /* isakmp_agg.c in Sources */,
-                               25F259390988657000D15623 /* isakmp_base.c in Sources */,
                                BA7777A11107EBCE00DD87E1 /* isakmp_frag.c in Sources */,
                                25F2593C0988657000D15623 /* isakmp_ident.c in Sources */,
                                25F2593D0988657000D15623 /* isakmp_inf.c in Sources */,
                                BA7777A11107EBCE00DD87E1 /* isakmp_frag.c in Sources */,
                                25F2593C0988657000D15623 /* isakmp_ident.c in Sources */,
                                25F2593D0988657000D15623 /* isakmp_inf.c in Sources */,
-                               25F2593E0988657000D15623 /* isakmp_newg.c in Sources */,
                                25F2593F0988657000D15623 /* isakmp_quick.c in Sources */,
                                25F259420988657000D15623 /* isakmp.c in Sources */,
                                25F259440988657000D15623 /* localconf.c in Sources */,
                                25F2593F0988657000D15623 /* isakmp_quick.c in Sources */,
                                25F259420988657000D15623 /* isakmp.c in Sources */,
                                25F259440988657000D15623 /* localconf.c in Sources */,
-                               25F259450988657000D15623 /* logger.c in Sources */,
                                25F259460988657000D15623 /* main.c in Sources */,
                                25F259470988657000D15623 /* misc.c in Sources */,
                                25F259490988657000D15623 /* oakley.c in Sources */,
                                25F259460988657000D15623 /* main.c in Sources */,
                                25F259470988657000D15623 /* misc.c in Sources */,
                                25F259490988657000D15623 /* oakley.c in Sources */,
@@ -1566,7 +1482,6 @@
                                25F2594C0988657000D15623 /* pfkey_racoon.c in Sources */,
                                25F2594F0988657000D15623 /* plog.c in Sources */,
                                25F259500988657000D15623 /* policy.c in Sources */,
                                25F2594C0988657000D15623 /* pfkey_racoon.c in Sources */,
                                25F2594F0988657000D15623 /* plog.c in Sources */,
                                25F259500988657000D15623 /* policy.c in Sources */,
-                               25F259510988657000D15623 /* privsep.c in Sources */,
                                25F259520988657000D15623 /* proposal.c in Sources */,
                                25F259580988657000D15623 /* remoteconf.c in Sources */,
                                25F2595A0988657000D15623 /* safefile.c in Sources */,
                                25F259520988657000D15623 /* proposal.c in Sources */,
                                25F259580988657000D15623 /* remoteconf.c in Sources */,
                                25F2595A0988657000D15623 /* safefile.c in Sources */,
@@ -1590,6 +1505,10 @@
                                BA5B6F2A0EC19F40003774E7 /* ipsecConfigTracer.c in Sources */,
                                BA5B6F2B0EC19F40003774E7 /* ipsecSessionTracer.c in Sources */,
                                BA485FA2109C1ECA00545E19 /* power_mgmt.c in Sources */,
                                BA5B6F2A0EC19F40003774E7 /* ipsecConfigTracer.c in Sources */,
                                BA5B6F2B0EC19F40003774E7 /* ipsecSessionTracer.c in Sources */,
                                BA485FA2109C1ECA00545E19 /* power_mgmt.c in Sources */,
+                               81CBCFE91447A1C20000D6E6 /* fsm.c in Sources */,
+                               BACD8C6A1496A50C0042DEA1 /* Preferences.c in Sources */,
+                               72F5C72E1607A1AE004C192F /* api_support.c in Sources */,
+                               723B6A30162F7BE300895EE5 /* xpc_racoon.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -1607,19 +1526,15 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               25F2580C0987FC3400D15623 /* Sources */ = {
+               69BB7E301E777E3C009EE2BA /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               2543473209DCAE27007943DE /* racoonctl.c in Sources */,
-                               2543474E09DCAEF8007943DE /* str2val.c in Sources */,
-                               2543475109DCB063007943DE /* kmpstat.c in Sources */,
-                               2543475509DCB0D9007943DE /* vmbuf.c in Sources */,
-                               2543475609DCB0DB007943DE /* sockmisc.c in Sources */,
-                               2543475709DCB0E6007943DE /* misc.c in Sources */,
-                               2543476409DCB396007943DE /* pfkey_dump.c in Sources */,
-                               2543476709DCB400007943DE /* key_debug.c in Sources */,
-                               2543476909DCB420007943DE /* pfkey.c in Sources */,
+                               7253CC651E7B3F4600B2DDF5 /* racoon_test.c in Sources */,
+                               6912CB771E78DD8800631D9A /* Preferences.c in Sources */,
+                               6912CB741E78D9D800631D9A /* plog.c in Sources */,
+                               6912CB731E78D9A900631D9A /* vmbuf.c in Sources */,
+                               6912CB6E1E78D94B00631D9A /* crypto_cssm.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -1627,38 +1542,31 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               812530C20D3FE9DC006BDF4F /* admin.c in Sources */,
+                               8141336B149015E900028D76 /* fsm.c in Sources */,
                                812530C30D3FE9DC006BDF4F /* algorithm.c in Sources */,
                                812530C30D3FE9DC006BDF4F /* algorithm.c in Sources */,
-                               812530C40D3FE9DC006BDF4F /* backupsa.c in Sources */,
                                812530C50D3FE9DC006BDF4F /* cfparse.y in Sources */,
                                812530C60D3FE9DC006BDF4F /* cftoken.l in Sources */,
                                81C325A80D46A36900E65EB7 /* crypto_cssm.c in Sources */,
                                812530C70D3FE9DC006BDF4F /* crypto_openssl.c in Sources */,
                                812530C80D3FE9DC006BDF4F /* dnssec.c in Sources */,
                                812530C50D3FE9DC006BDF4F /* cfparse.y in Sources */,
                                812530C60D3FE9DC006BDF4F /* cftoken.l in Sources */,
                                81C325A80D46A36900E65EB7 /* crypto_cssm.c in Sources */,
                                812530C70D3FE9DC006BDF4F /* crypto_openssl.c in Sources */,
                                812530C80D3FE9DC006BDF4F /* dnssec.c in Sources */,
-                               812530C90D3FE9DC006BDF4F /* evt.c in Sources */,
                                812530CA0D3FE9DC006BDF4F /* genlist.c in Sources */,
                                812530CB0D3FE9DC006BDF4F /* getcertsbyname.c in Sources */,
                                812530CC0D3FE9DC006BDF4F /* grabmyaddr.c in Sources */,
                                812530CA0D3FE9DC006BDF4F /* genlist.c in Sources */,
                                812530CB0D3FE9DC006BDF4F /* getcertsbyname.c in Sources */,
                                812530CC0D3FE9DC006BDF4F /* grabmyaddr.c in Sources */,
-                               812530CD0D3FE9DC006BDF4F /* gssapi.c in Sources */,
                                812530CE0D3FE9DC006BDF4F /* handler.c in Sources */,
                                812530CF0D3FE9DC006BDF4F /* ipsec_doi.c in Sources */,
                                812530D00D3FE9DC006BDF4F /* isakmp_agg.c in Sources */,
                                812530CE0D3FE9DC006BDF4F /* handler.c in Sources */,
                                812530CF0D3FE9DC006BDF4F /* ipsec_doi.c in Sources */,
                                812530D00D3FE9DC006BDF4F /* isakmp_agg.c in Sources */,
-                               812530D10D3FE9DC006BDF4F /* isakmp_base.c in Sources */,
                                BA7777A21107EBF600DD87E1 /* isakmp_frag.c in Sources */,
                                812530D20D3FE9DC006BDF4F /* isakmp_ident.c in Sources */,
                                812530D30D3FE9DC006BDF4F /* isakmp_inf.c in Sources */,
                                BA7777A21107EBF600DD87E1 /* isakmp_frag.c in Sources */,
                                812530D20D3FE9DC006BDF4F /* isakmp_ident.c in Sources */,
                                812530D30D3FE9DC006BDF4F /* isakmp_inf.c in Sources */,
-                               812530D40D3FE9DC006BDF4F /* isakmp_newg.c in Sources */,
                                812530D50D3FE9DC006BDF4F /* isakmp_quick.c in Sources */,
                                812530D60D3FE9DC006BDF4F /* isakmp.c in Sources */,
                                812530D70D3FE9DC006BDF4F /* localconf.c in Sources */,
                                812530D50D3FE9DC006BDF4F /* isakmp_quick.c in Sources */,
                                812530D60D3FE9DC006BDF4F /* isakmp.c in Sources */,
                                812530D70D3FE9DC006BDF4F /* localconf.c in Sources */,
-                               812530D80D3FE9DC006BDF4F /* logger.c in Sources */,
                                812530D90D3FE9DC006BDF4F /* main.c in Sources */,
                                812530DA0D3FE9DC006BDF4F /* misc.c in Sources */,
                                812530DB0D3FE9DC006BDF4F /* oakley.c in Sources */,
                                812530DC0D3FE9DC006BDF4F /* pfkey_racoon.c in Sources */,
                                812530DD0D3FE9DC006BDF4F /* plog.c in Sources */,
                                812530DE0D3FE9DC006BDF4F /* policy.c in Sources */,
                                812530D90D3FE9DC006BDF4F /* main.c in Sources */,
                                812530DA0D3FE9DC006BDF4F /* misc.c in Sources */,
                                812530DB0D3FE9DC006BDF4F /* oakley.c in Sources */,
                                812530DC0D3FE9DC006BDF4F /* pfkey_racoon.c in Sources */,
                                812530DD0D3FE9DC006BDF4F /* plog.c in Sources */,
                                812530DE0D3FE9DC006BDF4F /* policy.c in Sources */,
-                               812530DF0D3FE9DC006BDF4F /* privsep.c in Sources */,
                                812530E00D3FE9DC006BDF4F /* proposal.c in Sources */,
                                812530E10D3FE9DC006BDF4F /* remoteconf.c in Sources */,
                                812530E20D3FE9DC006BDF4F /* safefile.c in Sources */,
                                812530E00D3FE9DC006BDF4F /* proposal.c in Sources */,
                                812530E10D3FE9DC006BDF4F /* remoteconf.c in Sources */,
                                812530E20D3FE9DC006BDF4F /* safefile.c in Sources */,
@@ -1682,22 +1590,9 @@
                                BA5B6F2C0EC19F40003774E7 /* ipsecConfigTracer.c in Sources */,
                                BA5B6F2D0EC19F40003774E7 /* ipsecSessionTracer.c in Sources */,
                                BA485FA3109C1ECA00545E19 /* power_mgmt.c in Sources */,
                                BA5B6F2C0EC19F40003774E7 /* ipsecConfigTracer.c in Sources */,
                                BA5B6F2D0EC19F40003774E7 /* ipsecSessionTracer.c in Sources */,
                                BA485FA3109C1ECA00545E19 /* power_mgmt.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               812531150D3FEA33006BDF4F /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               812531160D3FEA33006BDF4F /* racoonctl.c in Sources */,
-                               812531170D3FEA33006BDF4F /* str2val.c in Sources */,
-                               812531180D3FEA33006BDF4F /* kmpstat.c in Sources */,
-                               812531190D3FEA33006BDF4F /* vmbuf.c in Sources */,
-                               8125311A0D3FEA33006BDF4F /* sockmisc.c in Sources */,
-                               8125311B0D3FEA33006BDF4F /* misc.c in Sources */,
-                               8125311C0D3FEA33006BDF4F /* pfkey_dump.c in Sources */,
-                               8125311D0D3FEA33006BDF4F /* key_debug.c in Sources */,
-                               8125311E0D3FEA33006BDF4F /* pfkey.c in Sources */,
+                               BACD8C6B1496A50C0042DEA1 /* Preferences.c in Sources */,
+                               72F5C72F1607A1AE004C192F /* api_support.c in Sources */,
+                               723B6A31162F7BE300895EE5 /* xpc_racoon.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -1730,76 +1625,66 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-               2537A1C309E494D300D0ECDA /* PBXTargetDependency */ = {
+               69983DBD1E7B3D30007683BF /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 2537A1A709E4864800D0ECDA /* libipsec */;
-                       targetProxy = 2537A1C209E494D300D0ECDA /* PBXContainerItemProxy */;
+                       target = 69BB7E331E777E3C009EE2BA /* racoon_test */;
+                       targetProxy = 69983DBC1E7B3D30007683BF /* PBXContainerItemProxy */;
                };
                };
-               2537A1C909E49D1400D0ECDA /* PBXTargetDependency */ = {
+               69983DBF1E7B4DE4007683BF /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 2537A1A709E4864800D0ECDA /* libipsec */;
-                       targetProxy = 2537A1C809E49D1400D0ECDA /* PBXContainerItemProxy */;
+                       target = 69BB7E331E777E3C009EE2BA /* racoon_test */;
+                       targetProxy = 69983DBE1E7B4DE4007683BF /* PBXContainerItemProxy */;
                };
                };
-               2537A1CD09E49D5C00D0ECDA /* PBXTargetDependency */ = {
+               724ED876168515A7008F2EBD /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 2537A1A709E4864800D0ECDA /* libipsec */;
-                       targetProxy = 2537A1CC09E49D5C00D0ECDA /* PBXContainerItemProxy */;
+                       target = 72B3C21116850B87004E4548 /* ipsec_libraries */;
+                       targetProxy = 724ED875168515A7008F2EBD /* PBXContainerItemProxy */;
                };
                };
-               812531110D3FEA28006BDF4F /* PBXTargetDependency */ = {
+               72B3C20E1684F5DE004E4548 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 812530BA0D3FE9DC006BDF4F /* racoon Embedded */;
-                       targetProxy = 812531100D3FEA28006BDF4F /* PBXContainerItemProxy */;
+                       target = 25F258040987FBFA00D15623 /* racoon */;
+                       targetProxy = 72B3C20D1684F5DE004E4548 /* PBXContainerItemProxy */;
                };
                };
-               8125312C0D3FEA44006BDF4F /* PBXTargetDependency */ = {
+               72B3C2101684F5E1004E4548 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 812531120D3FEA33006BDF4F /* racoonctl Embedded */;
-                       targetProxy = 8125312B0D3FEA44006BDF4F /* PBXContainerItemProxy */;
+                       target = 25F258090987FC1500D15623 /* setkey */;
+                       targetProxy = 72B3C20F1684F5E1004E4548 /* PBXContainerItemProxy */;
                };
                };
-               815C35F11525208900502220 /* PBXTargetDependency */ = {
+               72B3C21716850BA0004E4548 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 2537A1A709E4864800D0ECDA /* libipsec */;
                        isa = PBXTargetDependency;
                        target = 2537A1A709E4864800D0ECDA /* libipsec */;
-                       targetProxy = 815C35F01525208900502220 /* PBXContainerItemProxy */;
+                       targetProxy = 72B3C21616850BA0004E4548 /* PBXContainerItemProxy */;
                };
                };
-               815C35F31525209000502220 /* PBXTargetDependency */ = {
+               72B3C21916850CC5004E4548 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 25F258040987FBFA00D15623 /* racoon */;
-                       targetProxy = 815C35F21525209000502220 /* PBXContainerItemProxy */;
+                       target = 72B3C2081684F5C4004E4548 /* ipsec_executables */;
+                       targetProxy = 72B3C21816850CC5004E4548 /* PBXContainerItemProxy */;
                };
                };
-               815C35F51525209400502220 /* PBXTargetDependency */ = {
+               78C83A0F1898421100DB2F64 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 25F2580E0987FC3400D15623 /* racoonctl */;
-                       targetProxy = 815C35F41525209400502220 /* PBXContainerItemProxy */;
+                       target = 812530BA0D3FE9DC006BDF4F /* racoon Embedded */;
+                       targetProxy = 78C83A0E1898421100DB2F64 /* PBXContainerItemProxy */;
                };
                };
-               815C35F71525209800502220 /* PBXTargetDependency */ = {
+               78C83A111898421300DB2F64 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 25F258090987FC1500D15623 /* setkey */;
-                       targetProxy = 815C35F61525209800502220 /* PBXContainerItemProxy */;
+                       target = 81DDFD970D622C1700C5CB87 /* setkey Embedded */;
+                       targetProxy = 78C83A101898421300DB2F64 /* PBXContainerItemProxy */;
                };
                };
-               815C35F9152520BC00502220 /* PBXTargetDependency */ = {
+               78C83A131898421900DB2F64 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 815C35E61525201900502220 /* Project_base */;
-                       targetProxy = 815C35F8152520BC00502220 /* PBXContainerItemProxy */;
+                       target = 81DDFDB80D622C2700C5CB87 /* libipsec Embedded */;
+                       targetProxy = 78C83A121898421900DB2F64 /* PBXContainerItemProxy */;
                };
                };
-               815C35FB152520C000502220 /* PBXTargetDependency */ = {
+               812531110D3FEA28006BDF4F /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 815C35EB1525203F00502220 /* Project_executables */;
-                       targetProxy = 815C35FA152520C000502220 /* PBXContainerItemProxy */;
+                       target = 812530BA0D3FE9DC006BDF4F /* racoon Embedded */;
+                       targetProxy = 812531100D3FEA28006BDF4F /* PBXContainerItemProxy */;
                };
                81DDFDD90D622C4E00C5CB87 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 81DDFDB80D622C2700C5CB87 /* libipsec Embedded */;
                        targetProxy = 81DDFDD80D622C4E00C5CB87 /* PBXContainerItemProxy */;
                };
                };
                81DDFDD90D622C4E00C5CB87 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 81DDFDB80D622C2700C5CB87 /* libipsec Embedded */;
                        targetProxy = 81DDFDD80D622C4E00C5CB87 /* PBXContainerItemProxy */;
                };
-               81DDFDDF0D622D1700C5CB87 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 81DDFDB80D622C2700C5CB87 /* libipsec Embedded */;
-                       targetProxy = 81DDFDDE0D622D1700C5CB87 /* PBXContainerItemProxy */;
-               };
-               81DDFDE40D622D8C00C5CB87 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 81DDFDB80D622C2700C5CB87 /* libipsec Embedded */;
-                       targetProxy = 81DDFDE30D622D8C00C5CB87 /* PBXContainerItemProxy */;
-               };
                81DDFDF10D627DE300C5CB87 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 81DDFD970D622C1700C5CB87 /* setkey Embedded */;
                81DDFDF10D627DE300C5CB87 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 81DDFD970D622C1700C5CB87 /* setkey Embedded */;
@@ -1813,14 +1698,12 @@
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
-                               ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
                                EXECUTABLE_PREFIX = lib;
                                GCC_DYNAMIC_NO_PIC = NO;
                                ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
                                EXECUTABLE_PREFIX = lib;
                                GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
@@ -1834,10 +1717,8 @@
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/lib;
                                LEXFLAGS = "$(LEXFLAGS) -P__libipsec";
                                INSTALL_PATH = /usr/lib;
                                LEXFLAGS = "$(LEXFLAGS) -P__libipsec";
-                               PREBINDING = NO;
                                PRODUCT_NAME = ipsec.A;
                                SKIP_INSTALL = YES;
                                YACCFLAGS = "$(YACCFLAGS) -d -p__libipsec";
                                PRODUCT_NAME = ipsec.A;
                                SKIP_INSTALL = YES;
                                YACCFLAGS = "$(YACCFLAGS) -d -p__libipsec";
@@ -1850,13 +1731,11 @@
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
-                               ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
                                EXECUTABLE_PREFIX = lib;
                                ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
                                EXECUTABLE_PREFIX = lib;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
@@ -1869,10 +1748,8 @@
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/lib;
                                LEXFLAGS = "$(LEXFLAGS) -P__libipsec";
                                INSTALL_PATH = /usr/lib;
                                LEXFLAGS = "$(LEXFLAGS) -P__libipsec";
-                               PREBINDING = NO;
                                PRODUCT_NAME = ipsec.A;
                                YACCFLAGS = "$(YACCFLAGS) -d -p__libipsec";
                                ZERO_LINK = YES;
                                PRODUCT_NAME = ipsec.A;
                                YACCFLAGS = "$(YACCFLAGS) -d -p__libipsec";
                                ZERO_LINK = YES;
@@ -1884,13 +1761,11 @@
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
-                               ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
                                EXECUTABLE_PREFIX = lib;
                                ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
                                EXECUTABLE_PREFIX = lib;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "HAVE_CONFIG_H=1",
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "HAVE_CONFIG_H=1",
@@ -1902,10 +1777,8 @@
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/lib;
                                LEXFLAGS = "$(LEXFLAGS) -P__libipsec";
                                INSTALL_PATH = /usr/lib;
                                LEXFLAGS = "$(LEXFLAGS) -P__libipsec";
-                               PREBINDING = NO;
                                PRODUCT_NAME = ipsec.A;
                                YACCFLAGS = "$(YACCFLAGS) -d -p__libipsec";
                                ZERO_LINK = YES;
                                PRODUCT_NAME = ipsec.A;
                                YACCFLAGS = "$(YACCFLAGS) -d -p__libipsec";
                                ZERO_LINK = YES;
@@ -1915,58 +1788,48 @@
                25D3DAB9098952B20025F703 /* Development */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                25D3DAB9098952B20025F703 /* Development */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = "";
+                               CODE_SIGN_IDENTITY = "";
                                COPY_PHASE_STRIP = NO;
                                COPY_PHASE_STRIP = NO;
+                               HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = "IPSec (Aggregate)";
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = NO;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = "IPSec (Aggregate)";
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = NO;
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                               );
+                               WARNING_CFLAGS = "";
                        };
                        name = Development;
                };
                25D3DABA098952B20025F703 /* Deployment */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        };
                        name = Development;
                };
                25D3DABA098952B20025F703 /* Deployment */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = "";
+                               CODE_SIGN_IDENTITY = "";
                                COPY_PHASE_STRIP = NO;
                                COPY_PHASE_STRIP = NO;
+                               HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = "IPSec (Aggregate)";
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = NO;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = "IPSec (Aggregate)";
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = NO;
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                               );
+                               WARNING_CFLAGS = "";
                        };
                        name = Deployment;
                };
                25D3DABB098952B20025F703 /* Default */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        };
                        name = Deployment;
                };
                25D3DABB098952B20025F703 /* Default */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = "";
-                               "ARCHS[arch=*]" = "";
+                               CODE_SIGN_IDENTITY = "";
                                COPY_PHASE_STRIP = NO;
                                COPY_PHASE_STRIP = NO;
+                               HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = "IPSec (Aggregate)";
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = NO;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = "IPSec (Aggregate)";
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = NO;
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                               );
+                               WARNING_CFLAGS = "";
                        };
                        name = Default;
                };
                        };
                        name = Default;
                };
@@ -1977,7 +1840,10 @@
                                ALTERNATE_MODE = "$(inherited)";
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
                                ALTERNATE_MODE = "$(inherited)";
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements-mac.plist";
+                               CODE_SIGN_IDENTITY = "-";
                                COPY_PHASE_STRIP = NO;
                                COPY_PHASE_STRIP = NO;
+                               FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
@@ -1991,10 +1857,10 @@
                                        ../Common,
                                        Crypto,
                                        /tmp/ipsec.dst/usr/include,
                                        ../Common,
                                        Crypto,
                                        /tmp/ipsec.dst/usr/include,
+                                       "$(HEADER_SEARCH_PATHS)",
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/sbin;
                                LEXFLAGS = "";
                                OTHER_CFLAGS = (
                                INSTALL_PATH = /usr/sbin;
                                LEXFLAGS = "";
                                OTHER_CFLAGS = (
@@ -2008,14 +1874,16 @@
                                OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
                                PRODUCT_NAME = racoon;
                                PRODUCT_NAME = racoon;
+                               SDKROOT = macosx.internal;
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = YES;
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                        "-Wno-unknown-pragmas",
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = YES;
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                        "-Wno-unknown-pragmas",
+                                       "-Wcast-align",
+                                       "-Wimplicit-function-declaration",
                                );
                                YACCFLAGS = "$(YACCFLAGS) -d";
                                YACC_GENERATE_DEBUGGING_DIRECTIVES = NO;
                                );
                                YACCFLAGS = "$(YACCFLAGS) -d";
                                YACC_GENERATE_DEBUGGING_DIRECTIVES = NO;
@@ -2029,8 +1897,11 @@
                                ALTERNATE_MODE = "$(inherited)";
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
                                ALTERNATE_MODE = "$(inherited)";
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements-mac.plist";
+                               CODE_SIGN_IDENTITY = "-";
                                COPY_PHASE_STRIP = NO;
                                DSTROOT = "/tmp/$(PROJECT_NAME).dst";
                                COPY_PHASE_STRIP = NO;
                                DSTROOT = "/tmp/$(PROJECT_NAME).dst";
+                               FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2043,10 +1914,10 @@
                                        ../Common,
                                        Crypto,
                                        /tmp/ipsec.dst/usr/include,
                                        ../Common,
                                        Crypto,
                                        /tmp/ipsec.dst/usr/include,
+                                       "$(HEADER_SEARCH_PATHS)",
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/sbin;
                                OTHER_CFLAGS = (
                                        "$(OTHER_CFLAGS_QUOTED_1)",
                                INSTALL_PATH = /usr/sbin;
                                OTHER_CFLAGS = (
                                        "$(OTHER_CFLAGS_QUOTED_1)",
@@ -2059,13 +1930,15 @@
                                OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
                                PRODUCT_NAME = racoon;
                                PRODUCT_NAME = racoon;
+                               SDKROOT = macosx.internal;
                                SECTORDER_FLAGS = "";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                        "-Wno-unknown-pragmas",
                                SECTORDER_FLAGS = "";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                        "-Wno-unknown-pragmas",
+                                       "-Wcast-align",
+                                       "-Wimplicit-function-declaration",
                                );
                                YACCFLAGS = "$(YACCFLAGS) -d";
                        };
                                );
                                YACCFLAGS = "$(YACCFLAGS) -d";
                        };
@@ -2078,8 +1951,11 @@
                                ALTERNATE_MODE = "$(inherited)";
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
                                ALTERNATE_MODE = "$(inherited)";
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements-mac.plist";
+                               CODE_SIGN_IDENTITY = "-";
                                COPY_PHASE_STRIP = NO;
                                DSTROOT = "/tmp/$(PROJECT_NAME).dst";
                                COPY_PHASE_STRIP = NO;
                                DSTROOT = "/tmp/$(PROJECT_NAME).dst";
+                               FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2092,10 +1968,10 @@
                                        ../Common,
                                        Crypto,
                                        /tmp/ipsec.dst/usr/include,
                                        ../Common,
                                        Crypto,
                                        /tmp/ipsec.dst/usr/include,
+                                       "$(HEADER_SEARCH_PATHS)",
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/sbin;
                                OTHER_CFLAGS = (
                                        "$(OTHER_CFLAGS_QUOTED_1)",
                                INSTALL_PATH = /usr/sbin;
                                OTHER_CFLAGS = (
                                        "$(OTHER_CFLAGS_QUOTED_1)",
@@ -2108,13 +1984,15 @@
                                OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
                                PRODUCT_NAME = racoon;
                                PRODUCT_NAME = racoon;
+                               SDKROOT = macosx.internal;
                                SECTORDER_FLAGS = "";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                        "-Wno-unknown-pragmas",
                                SECTORDER_FLAGS = "";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                        "-Wno-unknown-pragmas",
+                                       "-Wcast-align",
+                                       "-Wimplicit-function-declaration",
                                );
                                YACCFLAGS = "$(YACCFLAGS) -d";
                        };
                                );
                                YACCFLAGS = "$(YACCFLAGS) -d";
                        };
@@ -2123,7 +2001,6 @@
                25D3DAC1098952B20025F703 /* Development */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                25D3DAC1098952B20025F703 /* Development */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALTERNATE_PERMISSIONS_FILES = "";
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
                                COPY_PHASE_STRIP = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
                                COPY_PHASE_STRIP = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2135,17 +2012,16 @@
                                HEADER_SEARCH_PATHS = (
                                        "$(DSTROOT)/usr/include",
                                        ../Common,
                                HEADER_SEARCH_PATHS = (
                                        "$(DSTROOT)/usr/include",
                                        ../Common,
+                                       "$(HEADER_SEARCH_PATHS)",
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "";
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "";
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
                                PRELINK_LIBS = "";
                                PRODUCT_NAME = setkey;
                                SECTORDER_FLAGS = "";
                                PRELINK_LIBS = "";
                                PRODUCT_NAME = setkey;
                                SECTORDER_FLAGS = "";
@@ -2162,7 +2038,6 @@
                25D3DAC2098952B20025F703 /* Deployment */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                25D3DAC2098952B20025F703 /* Deployment */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALTERNATE_PERMISSIONS_FILES = "";
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
                                COPY_PHASE_STRIP = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
                                COPY_PHASE_STRIP = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2174,17 +2049,16 @@
                                HEADER_SEARCH_PATHS = (
                                        "$(DSTROOT)/usr/include",
                                        ../Common,
                                HEADER_SEARCH_PATHS = (
                                        "$(DSTROOT)/usr/include",
                                        ../Common,
+                                       "$(HEADER_SEARCH_PATHS)",
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "";
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "";
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
                                PRELINK_LIBS = "";
                                PRODUCT_NAME = setkey;
                                SECTORDER_FLAGS = "";
                                PRELINK_LIBS = "";
                                PRODUCT_NAME = setkey;
                                SECTORDER_FLAGS = "";
@@ -2201,7 +2075,6 @@
                25D3DAC3098952B20025F703 /* Default */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                25D3DAC3098952B20025F703 /* Default */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALTERNATE_PERMISSIONS_FILES = "";
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
@@ -2212,17 +2085,16 @@
                                HEADER_SEARCH_PATHS = (
                                        "$(DSTROOT)/usr/include",
                                        ../Common,
                                HEADER_SEARCH_PATHS = (
                                        "$(DSTROOT)/usr/include",
                                        ../Common,
+                                       "$(HEADER_SEARCH_PATHS)",
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "";
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "";
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
                                PRELINK_LIBS = "";
                                PRODUCT_NAME = setkey;
                                SECTORDER_FLAGS = "";
                                PRELINK_LIBS = "";
                                PRODUCT_NAME = setkey;
                                SECTORDER_FLAGS = "";
@@ -2235,140 +2107,294 @@
                        };
                        name = Default;
                };
                        };
                        name = Default;
                };
-               25D3DAC5098952B20025F703 /* Development */ = {
+               25D3DACD098952B20025F703 /* Development */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALTERNATE_GROUP = "$(inherited)";
-                               ALTERNATE_MODE = "$(inherited)";
-                               ALTERNATE_OWNER = "$(inherited)";
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-                               COPY_PHASE_STRIP = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "HAVE_CONFIG_H=1",
-                                       "$(GCC_PREPROCESSOR_DEFINITIONS)",
-                               );
                                HEADER_SEARCH_PATHS = (
                                HEADER_SEARCH_PATHS = (
-                                       "$(DSTROOT)/usr/include",
-                                       "$(inherited)",
-                               );
-                               INSTALL_GROUP = wheel;
-                               INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
-                               INSTALL_PATH = /usr/sbin;
-                               OTHER_CFLAGS = "-DADMINPORTDIR=\\\"/var/run\\\"";
-                               OTHER_LDFLAGS = "";
-                               OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
-                               PRODUCT_NAME = racoonctl;
-                               SECTORDER_FLAGS = "";
-                               SKIP_INSTALL = YES;
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
+                                       /System/Library/Frameworks/System.framework/PrivateHeaders,
+                                       /System/Library/PrivateFrameworks,
+                                       /System/Library/PrivateFrameworks/SecureNetworking.framework/Headers,
                                );
                                );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Development;
                };
                        };
                        name = Development;
                };
-               25D3DAC6098952B20025F703 /* Deployment */ = {
+               25D3DACE098952B20025F703 /* Deployment */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALTERNATE_GROUP = "$(inherited)";
-                               ALTERNATE_MODE = "$(inherited)";
-                               ALTERNATE_OWNER = "$(inherited)";
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-                               COPY_PHASE_STRIP = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "HAVE_CONFIG_H=1",
-                                       "$(GCC_PREPROCESSOR_DEFINITIONS)",
-                               );
                                HEADER_SEARCH_PATHS = (
                                HEADER_SEARCH_PATHS = (
-                                       "$(DSTROOT)/usr/include",
-                                       "$(inherited)",
-                               );
-                               INSTALL_GROUP = wheel;
-                               INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
-                               INSTALL_PATH = /usr/sbin;
-                               OTHER_CFLAGS = "-DADMINPORTDIR=\\\"/var/run\\\"";
-                               OTHER_LDFLAGS = "";
-                               OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
-                               PRODUCT_NAME = racoonctl;
-                               SECTORDER_FLAGS = "";
-                               STRIP_INSTALLED_PRODUCT = YES;
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
+                                       /System/Library/Frameworks/System.framework/PrivateHeaders,
+                                       /System/Library/PrivateFrameworks,
+                                       /System/Library/PrivateFrameworks/SecureNetworking.framework/Headers,
                                );
                                );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Deployment;
                };
                        };
                        name = Deployment;
                };
-               25D3DAC7098952B20025F703 /* Default */ = {
+               25D3DACF098952B20025F703 /* Default */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALTERNATE_GROUP = "$(inherited)";
-                               ALTERNATE_MODE = "$(inherited)";
-                               ALTERNATE_OWNER = "$(inherited)";
-                               ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "HAVE_CONFIG_H=1",
-                                       "$(GCC_PREPROCESSOR_DEFINITIONS)",
-                               );
                                HEADER_SEARCH_PATHS = (
                                HEADER_SEARCH_PATHS = (
-                                       "$(DSTROOT)/usr/include",
-                                       "$(inherited)",
+                                       /System/Library/Frameworks/System.framework/PrivateHeaders,
+                                       /System/Library/PrivateFrameworks,
+                                       /System/Library/PrivateFrameworks/SecureNetworking.framework/Headers,
                                );
                                );
-                               INSTALL_GROUP = wheel;
-                               INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
-                               INSTALL_PATH = /usr/sbin;
-                               OTHER_CFLAGS = "-DADMINPORTDIR=\\\"/var/run\\\"";
-                               OTHER_LDFLAGS = "";
-                               OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
-                               PRODUCT_NAME = racoonctl;
-                               SECTORDER_FLAGS = "";
-                               STRIP_INSTALLED_PRODUCT = YES;
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Default;
+               };
+               69BB7E3D1E777E3D009EE2BA /* Development */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               APPLY_RULES_IN_COPY_FILES = YES;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "c++14";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INFINITE_RECURSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_SUSPICIOUS_MOVE = YES;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               ENABLE_TESTABILITY = YES;
+                               GCC_C_LANGUAGE_STANDARD = c11;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "DEBUG=1",
+                                       "$(inherited)",
                                );
                                );
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               GCC_WARN_UNUSED_FUNCTION = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 10.13;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               ONLY_ACTIVE_ARCH = NO;
+                               OTHER_CFLAGS = "-DUSE_SYSTEMCONFIGURATION_PRIVATE_HEADERS";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               STRIP_INSTALLED_PRODUCT = NO;
+                               SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvos appletvsimulator";
+                               TVOS_DEPLOYMENT_TARGET = 11.0;
+                               VALID_ARCHS = "arm64 arm64_32 arm64e armv4t armv5 armv6 armv6m armv7 armv7em armv7f armv7k armv7m armv7s xscale x86_64h x86_64 i386";
+                               VERSIONING_SYSTEM = "apple-generic";
+                       };
+                       name = Development;
+               };
+               69BB7E3E1E777E3D009EE2BA /* Deployment */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               APPLY_RULES_IN_COPY_FILES = YES;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "c++14";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INFINITE_RECURSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_SUSPICIOUS_MOVE = YES;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
+                               COPY_PHASE_STRIP = YES;
+                               DEAD_CODE_STRIPPING = YES;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               ENABLE_NS_ASSERTIONS = NO;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               GCC_C_LANGUAGE_STANDARD = c11;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               GCC_WARN_UNUSED_FUNCTION = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 10.13;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_CFLAGS = "-DUSE_SYSTEMCONFIGURATION_PRIVATE_HEADERS";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvos appletvsimulator";
+                               TVOS_DEPLOYMENT_TARGET = 11.0;
+                               VALIDATE_PRODUCT = YES;
+                               VALID_ARCHS = "arm64 arm64_32 arm64e armv4t armv5 armv6 armv6m armv7 armv7em armv7f armv7k armv7m armv7s xscale x86_64h x86_64 i386";
+                               VERSIONING_SYSTEM = "apple-generic";
+                       };
+                       name = Deployment;
+               };
+               69BB7E3F1E777E3D009EE2BA /* Default */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               APPLY_RULES_IN_COPY_FILES = YES;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "c++14";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INFINITE_RECURSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_SUSPICIOUS_MOVE = YES;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
+                               COPY_PHASE_STRIP = YES;
+                               DEAD_CODE_STRIPPING = YES;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               ENABLE_NS_ASSERTIONS = NO;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               GCC_C_LANGUAGE_STANDARD = c11;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               GCC_WARN_UNUSED_FUNCTION = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 10.13;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_CFLAGS = "-DUSE_SYSTEMCONFIGURATION_PRIVATE_HEADERS";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvos appletvsimulator";
+                               TVOS_DEPLOYMENT_TARGET = 11.0;
+                               VALIDATE_PRODUCT = YES;
+                               VALID_ARCHS = "arm64 arm64_32 arm64e armv4t armv5 armv6 armv6m armv7 armv7em armv7f armv7k armv7m armv7s xscale x86_64h x86_64 i386";
+                               VERSIONING_SYSTEM = "apple-generic";
                        };
                        name = Default;
                };
                        };
                        name = Default;
                };
-               25D3DACD098952B20025F703 /* Development */ = {
+               72B3C2091684F5C4004E4548 /* Development */ = {
                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                        buildSettings = {
-                               ADDITIONAL_SDKS = "";
-                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = macosx.internal;
                        };
                        name = Development;
                };
                        };
                        name = Development;
                };
-               25D3DACE098952B20025F703 /* Deployment */ = {
+               72B3C20A1684F5C4004E4548 /* Deployment */ = {
                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                        buildSettings = {
-                               ADDITIONAL_SDKS = "";
-                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = macosx.internal;
                        };
                        name = Deployment;
                };
                        };
                        name = Deployment;
                };
-               25D3DACF098952B20025F703 /* Default */ = {
+               72B3C20B1684F5C4004E4548 /* Default */ = {
                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                        buildSettings = {
-                               ADDITIONAL_SDKS = "";
-                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = macosx.internal;
+                       };
+                       name = Default;
+               };
+               72B3C21316850B87004E4548 /* Development */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Development;
+               };
+               72B3C21416850B87004E4548 /* Deployment */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Deployment;
+               };
+               72B3C21516850B87004E4548 /* Default */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Default;
+               };
+               78C83A05189841E800DB2F64 /* Development */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Development;
+               };
+               78C83A06189841E800DB2F64 /* Deployment */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Deployment;
+               };
+               78C83A07189841E800DB2F64 /* Default */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Default;
+               };
+               78C83A0B189841FA00DB2F64 /* Development */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                       };
+                       name = Development;
+               };
+               78C83A0C189841FA00DB2F64 /* Deployment */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                       };
+                       name = Deployment;
+               };
+               78C83A0D189841FA00DB2F64 /* Default */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
                        };
                        name = Default;
                };
                        };
                        name = Default;
                };
@@ -2377,16 +2403,19 @@
                        buildSettings = {
                                ADDITIONAL_SDKS = "";
                                ARCHS = (
                        buildSettings = {
                                ADDITIONAL_SDKS = "";
                                ARCHS = (
+                                       armv6,
                                        armv7,
                                        armv7,
-                                       armv7s,
                                );
                                COPY_PHASE_STRIP = NO;
                                );
                                COPY_PHASE_STRIP = NO;
+                               FRAMEWORK_SEARCH_PATHS = "";
+                               HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = "IPSec Embedded (Aggregate)";
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = NO;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = "IPSec Embedded (Aggregate)";
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = NO;
+                               SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
@@ -2400,16 +2429,19 @@
                        buildSettings = {
                                ADDITIONAL_SDKS = "";
                                ARCHS = (
                        buildSettings = {
                                ADDITIONAL_SDKS = "";
                                ARCHS = (
+                                       armv6,
                                        armv7,
                                        armv7,
-                                       armv7s,
                                );
                                COPY_PHASE_STRIP = NO;
                                );
                                COPY_PHASE_STRIP = NO;
+                               FRAMEWORK_SEARCH_PATHS = "";
+                               HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = "IPSec Embedded (Aggregate)";
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = NO;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = "IPSec Embedded (Aggregate)";
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = NO;
+                               SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
@@ -2422,18 +2454,20 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ADDITIONAL_SDKS = "";
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ADDITIONAL_SDKS = "";
-                               ARCHS = "";
-                               "ARCHS[arch=*]" = (
+                               ARCHS = (
+                                       armv6,
                                        armv7,
                                        armv7,
-                                       armv7s,
                                );
                                COPY_PHASE_STRIP = NO;
                                );
                                COPY_PHASE_STRIP = NO;
+                               FRAMEWORK_SEARCH_PATHS = "";
+                               HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = "IPSec Embedded (Aggregate)";
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = NO;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = "IPSec Embedded (Aggregate)";
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = NO;
+                               SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
@@ -2444,23 +2478,13 @@
                };
                812531060D3FE9DC006BDF4F /* Development */ = {
                        isa = XCBuildConfiguration;
                };
                812531060D3FE9DC006BDF4F /* Development */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "$(inherited)";
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "$(inherited)";
-                               ALTERNATE_OWNER = "$(inherited)";
-                               ARCHS = (
-                                       armv7,
-                                       armv7s,
-                               );
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
-                               CODE_SIGN_IDENTITY = "-";
+                               CODE_SIGN_IDENTITY = "";
                                COPY_PHASE_STRIP = NO;
                                COPY_PHASE_STRIP = NO;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\\\"$(SDKROOT)/System/Library/Frameworks\\\"",
-                                       "\\\"$(DEVELOPER_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.0.Internal.sdk/System/Library/Frameworks\\\"",
-                               );
+                               FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
@@ -2474,16 +2498,17 @@
                                        ../Common,
                                        Crypto,
                                        /tmp/ipsec.dst/usr/include,
                                        ../Common,
                                        Crypto,
                                        /tmp/ipsec.dst/usr/include,
+                                       "$(HEADER_SEARCH_PATHS)",
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/sbin;
                                LEXFLAGS = "";
                                OTHER_CFLAGS = (
                                        "$(OTHER_CFLAGS_QUOTED_1)",
                                        "$(OTHER_CFLAGS_QUOTED_2)",
                                        "$(OTHER_CFLAGS_QUOTED_3)",
                                INSTALL_PATH = /usr/sbin;
                                LEXFLAGS = "";
                                OTHER_CFLAGS = (
                                        "$(OTHER_CFLAGS_QUOTED_1)",
                                        "$(OTHER_CFLAGS_QUOTED_2)",
                                        "$(OTHER_CFLAGS_QUOTED_3)",
+                                       "-DUSE_SYSTEMCONFIGURATION_PRIVATE_HEADERS",
                                );
                                OTHER_CFLAGS_QUOTED_1 = "-DSYSCONFDIR=\\\"/etc/racoon\\\"";
                                OTHER_CFLAGS_QUOTED_2 = "-DADMINPORTDIR=\\\"/var/run\\\"";
                                );
                                OTHER_CFLAGS_QUOTED_1 = "-DSYSCONFDIR=\\\"/etc/racoon\\\"";
                                OTHER_CFLAGS_QUOTED_2 = "-DADMINPORTDIR=\\\"/var/run\\\"";
@@ -2491,10 +2516,11 @@
                                OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
                                PRODUCT_NAME = racoon;
                                PRODUCT_NAME = racoon;
+                               SDKROOT = iphoneos.internal;
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = YES;
                                SECTORDER_FLAGS = "";
                                SKIP_INSTALL = YES;
+                               SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
@@ -2508,24 +2534,14 @@
                };
                812531070D3FE9DC006BDF4F /* Deployment */ = {
                        isa = XCBuildConfiguration;
                };
                812531070D3FE9DC006BDF4F /* Deployment */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "$(inherited)";
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "$(inherited)";
-                               ALTERNATE_OWNER = "$(inherited)";
-                               ARCHS = (
-                                       armv7,
-                                       armv7s,
-                               );
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
-                               CODE_SIGN_IDENTITY = "-";
+                               CODE_SIGN_IDENTITY = "";
                                COPY_PHASE_STRIP = NO;
                                DSTROOT = "/tmp/$(PROJECT_NAME).dst";
                                COPY_PHASE_STRIP = NO;
                                DSTROOT = "/tmp/$(PROJECT_NAME).dst";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\\\"$(SDKROOT)/System/Library/Frameworks\\\"",
-                                       "\\\"$(DEVELOPER_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.0.Internal.sdk/System/Library/Frameworks\\\"",
-                               );
+                               FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2538,15 +2554,16 @@
                                        ../Common,
                                        Crypto,
                                        /tmp/ipsec.dst/usr/include,
                                        ../Common,
                                        Crypto,
                                        /tmp/ipsec.dst/usr/include,
+                                       "$(HEADER_SEARCH_PATHS)",
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/sbin;
                                OTHER_CFLAGS = (
                                        "$(OTHER_CFLAGS_QUOTED_1)",
                                        "$(OTHER_CFLAGS_QUOTED_2)",
                                        "$(OTHER_CFLAGS_QUOTED_3)",
                                INSTALL_PATH = /usr/sbin;
                                OTHER_CFLAGS = (
                                        "$(OTHER_CFLAGS_QUOTED_1)",
                                        "$(OTHER_CFLAGS_QUOTED_2)",
                                        "$(OTHER_CFLAGS_QUOTED_3)",
+                                       "-DUSE_SYSTEMCONFIGURATION_PRIVATE_HEADERS",
                                );
                                OTHER_CFLAGS_QUOTED_1 = "-DSYSCONFDIR=\\\"/etc/racoon\\\"";
                                OTHER_CFLAGS_QUOTED_2 = "-DADMINPORTDIR=\\\"/var/run\\\"";
                                );
                                OTHER_CFLAGS_QUOTED_1 = "-DSYSCONFDIR=\\\"/etc/racoon\\\"";
                                OTHER_CFLAGS_QUOTED_2 = "-DADMINPORTDIR=\\\"/var/run\\\"";
@@ -2554,9 +2571,10 @@
                                OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
                                PRODUCT_NAME = racoon;
                                PRODUCT_NAME = racoon;
+                               SDKROOT = iphoneos.internal;
                                SECTORDER_FLAGS = "";
                                SECTORDER_FLAGS = "";
+                               SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
@@ -2569,24 +2587,14 @@
                };
                812531090D3FE9DC006BDF4F /* Default */ = {
                        isa = XCBuildConfiguration;
                };
                812531090D3FE9DC006BDF4F /* Default */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "$(inherited)";
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "$(inherited)";
-                               ALTERNATE_OWNER = "$(inherited)";
-                               ARCHS = (
-                                       armv7,
-                                       armv7s,
-                               );
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
-                               CODE_SIGN_IDENTITY = "-";
+                               CODE_SIGN_IDENTITY = "";
                                COPY_PHASE_STRIP = NO;
                                DSTROOT = "/tmp/$(PROJECT_NAME).dst";
                                COPY_PHASE_STRIP = NO;
                                DSTROOT = "/tmp/$(PROJECT_NAME).dst";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\\\"$(SDKROOT)/System/Library/Frameworks\\\"",
-                                       "\\\"$(DEVELOPER_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.0.Internal.sdk/System/Library/Frameworks\\\"",
-                               );
+                               FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2599,15 +2607,16 @@
                                        ../Common,
                                        Crypto,
                                        /tmp/ipsec.dst/usr/include,
                                        ../Common,
                                        Crypto,
                                        /tmp/ipsec.dst/usr/include,
+                                       "$(HEADER_SEARCH_PATHS)",
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/sbin;
                                OTHER_CFLAGS = (
                                        "$(OTHER_CFLAGS_QUOTED_1)",
                                        "$(OTHER_CFLAGS_QUOTED_2)",
                                        "$(OTHER_CFLAGS_QUOTED_3)",
                                INSTALL_PATH = /usr/sbin;
                                OTHER_CFLAGS = (
                                        "$(OTHER_CFLAGS_QUOTED_1)",
                                        "$(OTHER_CFLAGS_QUOTED_2)",
                                        "$(OTHER_CFLAGS_QUOTED_3)",
+                                       "-DUSE_SYSTEMCONFIGURATION_PRIVATE_HEADERS",
                                );
                                OTHER_CFLAGS_QUOTED_1 = "-DSYSCONFDIR=\\\"/etc/racoon\\\"";
                                OTHER_CFLAGS_QUOTED_2 = "-DADMINPORTDIR=\\\"/var/run\\\"";
                                );
                                OTHER_CFLAGS_QUOTED_1 = "-DSYSCONFDIR=\\\"/etc/racoon\\\"";
                                OTHER_CFLAGS_QUOTED_2 = "-DADMINPORTDIR=\\\"/var/run\\\"";
@@ -2615,9 +2624,10 @@
                                OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
                                PRODUCT_NAME = racoon;
                                PRODUCT_NAME = racoon;
+                               SDKROOT = iphoneos.internal;
                                SECTORDER_FLAGS = "";
                                SECTORDER_FLAGS = "";
+                               SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
@@ -2628,185 +2638,13 @@
                        };
                        name = Default;
                };
                        };
                        name = Default;
                };
-               812531250D3FEA33006BDF4F /* Development */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
-                       buildSettings = {
-                               ALTERNATE_GROUP = "$(inherited)";
-                               ALTERNATE_MODE = "$(inherited)";
-                               ALTERNATE_OWNER = "$(inherited)";
-                               ARCHS = (
-                                       armv7,
-                                       armv7s,
-                               );
-                               COPY_PHASE_STRIP = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "HAVE_CONFIG_H=1",
-                                       "$(GCC_PREPROCESSOR_DEFINITIONS)",
-                               );
-                               HEADER_SEARCH_PATHS = (
-                                       "$(DSTROOT)/usr/include",
-                                       "$(inherited)",
-                               );
-                               INSTALL_GROUP = wheel;
-                               INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
-                               INSTALL_PATH = /usr/sbin;
-                               OTHER_CFLAGS = "-DADMINPORTDIR=\\\"/tmp/racoon\\\"";
-                               OTHER_LDFLAGS = "";
-                               OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
-                               PRODUCT_NAME = racoonctl;
-                               SECTORDER_FLAGS = "";
-                               SKIP_INSTALL = YES;
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                                       "-Wcast-align",
-                               );
-                       };
-                       name = Development;
-               };
-               812531260D3FEA33006BDF4F /* Deployment */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
-                       buildSettings = {
-                               ALTERNATE_GROUP = "$(inherited)";
-                               ALTERNATE_MODE = "$(inherited)";
-                               ALTERNATE_OWNER = "$(inherited)";
-                               ARCHS = (
-                                       armv7,
-                                       armv7s,
-                               );
-                               COPY_PHASE_STRIP = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "HAVE_CONFIG_H=1",
-                                       "$(GCC_PREPROCESSOR_DEFINITIONS)",
-                               );
-                               HEADER_SEARCH_PATHS = (
-                                       "$(DSTROOT)/usr/include",
-                                       "$(inherited)",
-                               );
-                               INSTALL_GROUP = wheel;
-                               INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
-                               INSTALL_PATH = /usr/sbin;
-                               OTHER_CFLAGS = "-DADMINPORTDIR=\\\"/tmp/racoon\\\"";
-                               OTHER_LDFLAGS = "";
-                               OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
-                               PRODUCT_NAME = racoonctl;
-                               SECTORDER_FLAGS = "";
-                               STRIP_INSTALLED_PRODUCT = YES;
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                                       "-Wcast-align",
-                               );
-                       };
-                       name = Deployment;
-               };
-               812531280D3FEA33006BDF4F /* Default */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
-                       buildSettings = {
-                               ALTERNATE_GROUP = "$(inherited)";
-                               ALTERNATE_MODE = "$(inherited)";
-                               ALTERNATE_OWNER = "$(inherited)";
-                               ARCHS = (
-                                       armv7,
-                                       armv7s,
-                               );
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "HAVE_CONFIG_H=1",
-                                       "$(GCC_PREPROCESSOR_DEFINITIONS)",
-                               );
-                               HEADER_SEARCH_PATHS = (
-                                       "$(DSTROOT)/usr/include",
-                                       "$(inherited)",
-                               );
-                               INSTALL_GROUP = wheel;
-                               INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
-                               INSTALL_PATH = /usr/sbin;
-                               OTHER_CFLAGS = "-DADMINPORTDIR=\\\"/tmp/racoon\\\"";
-                               OTHER_LDFLAGS = "";
-                               OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
-                               PRODUCT_NAME = racoonctl;
-                               SECTORDER_FLAGS = "";
-                               STRIP_INSTALLED_PRODUCT = YES;
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                                       "-Wcast-align",
-                               );
-                       };
-                       name = Default;
-               };
-               815C35E81525201900502220 /* Development */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               TARGETED_DEVICE_FAMILY = "";
-                       };
-                       name = Development;
-               };
-               815C35E91525201900502220 /* Deployment */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               TARGETED_DEVICE_FAMILY = "";
-                       };
-                       name = Deployment;
-               };
-               815C35EA1525201900502220 /* Default */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               TARGETED_DEVICE_FAMILY = "";
-                       };
-                       name = Default;
-               };
-               815C35ED1525203F00502220 /* Development */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Development;
-               };
-               815C35EE1525203F00502220 /* Deployment */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Deployment;
-               };
-               815C35EF1525203F00502220 /* Default */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Default;
-               };
                81DDFDA70D622C1700C5CB87 /* Development */ = {
                        isa = XCBuildConfiguration;
                81DDFDA70D622C1700C5CB87 /* Development */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                        buildSettings = {
-                               ARCHS = (
-                                       armv7,
-                                       armv7s,
-                               );
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               CODE_SIGN_IDENTITY = "";
                                COPY_PHASE_STRIP = NO;
                                COPY_PHASE_STRIP = NO;
+                               FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
@@ -2817,17 +2655,16 @@
                                HEADER_SEARCH_PATHS = (
                                        "$(DSTROOT)/usr/include",
                                        ../Common,
                                HEADER_SEARCH_PATHS = (
                                        "$(DSTROOT)/usr/include",
                                        ../Common,
+                                       "$(HEADER_SEARCH_PATHS)",
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "";
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "";
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
                                PRELINK_LIBS = "";
                                PRODUCT_NAME = setkey;
                                SECTORDER_FLAGS = "";
                                PRELINK_LIBS = "";
                                PRODUCT_NAME = setkey;
                                SECTORDER_FLAGS = "";
@@ -2844,13 +2681,11 @@
                };
                81DDFDA80D622C1700C5CB87 /* Deployment */ = {
                        isa = XCBuildConfiguration;
                };
                81DDFDA80D622C1700C5CB87 /* Deployment */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                        buildSettings = {
-                               ARCHS = (
-                                       armv7,
-                                       armv7s,
-                               );
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               CODE_SIGN_IDENTITY = "";
                                COPY_PHASE_STRIP = YES;
                                COPY_PHASE_STRIP = YES;
+                               FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
@@ -2860,17 +2695,16 @@
                                HEADER_SEARCH_PATHS = (
                                        "$(DSTROOT)/usr/include",
                                        ../Common,
                                HEADER_SEARCH_PATHS = (
                                        "$(DSTROOT)/usr/include",
                                        ../Common,
+                                       "$(HEADER_SEARCH_PATHS)",
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "";
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "";
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
                                PRELINK_LIBS = "";
                                PRODUCT_NAME = setkey;
                                SECTORDER_FLAGS = "";
                                PRELINK_LIBS = "";
                                PRODUCT_NAME = setkey;
                                SECTORDER_FLAGS = "";
@@ -2887,12 +2721,10 @@
                };
                81DDFDA90D622C1700C5CB87 /* Default */ = {
                        isa = XCBuildConfiguration;
                };
                81DDFDA90D622C1700C5CB87 /* Default */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                        buildSettings = {
-                               ARCHS = (
-                                       armv7,
-                                       armv7s,
-                               );
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               CODE_SIGN_IDENTITY = "";
+                               FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
@@ -2902,17 +2734,16 @@
                                HEADER_SEARCH_PATHS = (
                                        "$(DSTROOT)/usr/include",
                                        ../Common,
                                HEADER_SEARCH_PATHS = (
                                        "$(DSTROOT)/usr/include",
                                        ../Common,
+                                       "$(HEADER_SEARCH_PATHS)",
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "";
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                INSTALL_PATH = /usr/sbin;
                                LIBRARY_SEARCH_PATHS = "";
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PREBINDING = NO;
                                PRELINK_LIBS = "";
                                PRODUCT_NAME = setkey;
                                SECTORDER_FLAGS = "";
                                PRELINK_LIBS = "";
                                PRODUCT_NAME = setkey;
                                SECTORDER_FLAGS = "";
@@ -2928,21 +2759,17 @@
                };
                81DDFDCA0D622C2700C5CB87 /* Development */ = {
                        isa = XCBuildConfiguration;
                };
                81DDFDCA0D622C2700C5CB87 /* Development */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
-                               ALTERNATE_OWNER = "$(inherited)";
-                               ARCHS = (
-                                       armv7,
-                                       armv7s,
-                               );
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               CODE_SIGN_IDENTITY = "";
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
                                EXECUTABLE_PREFIX = lib;
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
                                EXECUTABLE_PREFIX = lib;
+                               FRAMEWORK_SEARCH_PATHS = "";
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
@@ -2956,10 +2783,8 @@
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/lib;
                                LEXFLAGS = "$(LEXFLAGS) -P__libipsec";
                                INSTALL_PATH = /usr/lib;
                                LEXFLAGS = "$(LEXFLAGS) -P__libipsec";
-                               PREBINDING = NO;
                                PRODUCT_NAME = ipsec.A;
                                SKIP_INSTALL = YES;
                                WARNING_CFLAGS = "-Wcast-align";
                                PRODUCT_NAME = ipsec.A;
                                SKIP_INSTALL = YES;
                                WARNING_CFLAGS = "-Wcast-align";
@@ -2970,20 +2795,16 @@
                };
                81DDFDCB0D622C2700C5CB87 /* Deployment */ = {
                        isa = XCBuildConfiguration;
                };
                81DDFDCB0D622C2700C5CB87 /* Deployment */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
-                               ALTERNATE_OWNER = "$(inherited)";
-                               ARCHS = (
-                                       armv7,
-                                       armv7s,
-                               );
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               CODE_SIGN_IDENTITY = "";
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
                                EXECUTABLE_PREFIX = lib;
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
                                EXECUTABLE_PREFIX = lib;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                               FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
@@ -2996,10 +2817,8 @@
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/lib;
                                LEXFLAGS = "$(LEXFLAGS) -P__libipsec";
                                INSTALL_PATH = /usr/lib;
                                LEXFLAGS = "$(LEXFLAGS) -P__libipsec";
-                               PREBINDING = NO;
                                PRODUCT_NAME = ipsec.A;
                                WARNING_CFLAGS = "-Wcast-align";
                                YACCFLAGS = "$(YACCFLAGS) -d -p__libipsec";
                                PRODUCT_NAME = ipsec.A;
                                WARNING_CFLAGS = "-Wcast-align";
                                YACCFLAGS = "$(YACCFLAGS) -d -p__libipsec";
@@ -3009,20 +2828,16 @@
                };
                81DDFDCC0D622C2700C5CB87 /* Default */ = {
                        isa = XCBuildConfiguration;
                };
                81DDFDCC0D622C2700C5CB87 /* Default */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
-                               ALTERNATE_OWNER = "$(inherited)";
-                               ARCHS = (
-                                       armv7,
-                                       armv7s,
-                               );
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               CODE_SIGN_IDENTITY = "";
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
                                EXECUTABLE_PREFIX = lib;
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
                                EXECUTABLE_PREFIX = lib;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               FRAMEWORK_SEARCH_PATHS = "";
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "HAVE_CONFIG_H=1",
                                GCC_MODEL_TUNING = G5;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "HAVE_CONFIG_H=1",
@@ -3034,10 +2849,8 @@
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
                                );
                                INSTALL_GROUP = wheel;
                                INSTALL_MODE_FLAG = 555;
-                               INSTALL_OWNER = root;
                                INSTALL_PATH = /usr/lib;
                                LEXFLAGS = "$(LEXFLAGS) -P__libipsec";
                                INSTALL_PATH = /usr/lib;
                                LEXFLAGS = "$(LEXFLAGS) -P__libipsec";
-                               PREBINDING = NO;
                                PRODUCT_NAME = ipsec.A;
                                WARNING_CFLAGS = "-Wcast-align";
                                YACCFLAGS = "$(YACCFLAGS) -d -p__libipsec";
                                PRODUCT_NAME = ipsec.A;
                                WARNING_CFLAGS = "-Wcast-align";
                                YACCFLAGS = "$(YACCFLAGS) -d -p__libipsec";
@@ -3056,7 +2869,7 @@
                                2537A1AC09E4866800D0ECDA /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                                2537A1AC09E4866800D0ECDA /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
                25D3DAB8098952B20025F703 /* Build configuration list for PBXAggregateTarget "IPSec (Aggregate)" */ = {
                        isa = XCConfigurationList;
                };
                25D3DAB8098952B20025F703 /* Build configuration list for PBXAggregateTarget "IPSec (Aggregate)" */ = {
                        isa = XCConfigurationList;
@@ -3066,7 +2879,7 @@
                                25D3DABB098952B20025F703 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                                25D3DABB098952B20025F703 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
                25D3DABC098952B20025F703 /* Build configuration list for PBXNativeTarget "racoon" */ = {
                        isa = XCConfigurationList;
                };
                25D3DABC098952B20025F703 /* Build configuration list for PBXNativeTarget "racoon" */ = {
                        isa = XCConfigurationList;
@@ -3076,7 +2889,7 @@
                                25D3DABF098952B20025F703 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                                25D3DABF098952B20025F703 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
                25D3DAC0098952B20025F703 /* Build configuration list for PBXNativeTarget "setkey" */ = {
                        isa = XCConfigurationList;
                };
                25D3DAC0098952B20025F703 /* Build configuration list for PBXNativeTarget "setkey" */ = {
                        isa = XCConfigurationList;
@@ -3086,77 +2899,87 @@
                                25D3DAC3098952B20025F703 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                                25D3DAC3098952B20025F703 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
                };
-               25D3DAC4098952B20025F703 /* Build configuration list for PBXNativeTarget "racoonctl" */ = {
+               25D3DACC098952B20025F703 /* Build configuration list for PBXProject "ipsec" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               25D3DAC5098952B20025F703 /* Development */,
-                               25D3DAC6098952B20025F703 /* Deployment */,
-                               25D3DAC7098952B20025F703 /* Default */,
+                               25D3DACD098952B20025F703 /* Development */,
+                               25D3DACE098952B20025F703 /* Deployment */,
+                               25D3DACF098952B20025F703 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
                };
-               25D3DACC098952B20025F703 /* Build configuration list for PBXProject "ipsec" */ = {
+               69BB7E3C1E777E3D009EE2BA /* Build configuration list for PBXNativeTarget "racoon_test" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               25D3DACD098952B20025F703 /* Development */,
-                               25D3DACE098952B20025F703 /* Deployment */,
-                               25D3DACF098952B20025F703 /* Default */,
+                               69BB7E3D1E777E3D009EE2BA /* Development */,
+                               69BB7E3E1E777E3D009EE2BA /* Deployment */,
+                               69BB7E3F1E777E3D009EE2BA /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
                };
-               812530B50D3FE994006BDF4F /* Build configuration list for PBXAggregateTarget "IPSec Embedded (Aggregate)" */ = {
+               72B3C20C1684F5C4004E4548 /* Build configuration list for PBXAggregateTarget "ipsec_executables" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               812530B60D3FE994006BDF4F /* Development */,
-                               812530B70D3FE994006BDF4F /* Deployment */,
-                               812530B90D3FE994006BDF4F /* Default */,
+                               72B3C2091684F5C4004E4548 /* Development */,
+                               72B3C20A1684F5C4004E4548 /* Deployment */,
+                               72B3C20B1684F5C4004E4548 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
                };
-               812531050D3FE9DC006BDF4F /* Build configuration list for PBXNativeTarget "racoon Embedded" */ = {
+               72B3C21216850B87004E4548 /* Build configuration list for PBXAggregateTarget "ipsec_libraries" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               812531060D3FE9DC006BDF4F /* Development */,
-                               812531070D3FE9DC006BDF4F /* Deployment */,
-                               812531090D3FE9DC006BDF4F /* Default */,
+                               72B3C21316850B87004E4548 /* Development */,
+                               72B3C21416850B87004E4548 /* Deployment */,
+                               72B3C21516850B87004E4548 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
                };
-               812531240D3FEA33006BDF4F /* Build configuration list for PBXNativeTarget "racoonctl Embedded" */ = {
+               78C83A08189841E800DB2F64 /* Build configuration list for PBXAggregateTarget "ipsec_libraries_embedded" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               812531250D3FEA33006BDF4F /* Development */,
-                               812531260D3FEA33006BDF4F /* Deployment */,
-                               812531280D3FEA33006BDF4F /* Default */,
+                               78C83A05189841E800DB2F64 /* Development */,
+                               78C83A06189841E800DB2F64 /* Deployment */,
+                               78C83A07189841E800DB2F64 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
                };
-               815C35E71525201900502220 /* Build configuration list for PBXAggregateTarget "Project_base" */ = {
+               78C83A0A189841FA00DB2F64 /* Build configuration list for PBXAggregateTarget "ipsec_executables_embedded" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               815C35E81525201900502220 /* Development */,
-                               815C35E91525201900502220 /* Deployment */,
-                               815C35EA1525201900502220 /* Default */,
+                               78C83A0B189841FA00DB2F64 /* Development */,
+                               78C83A0C189841FA00DB2F64 /* Deployment */,
+                               78C83A0D189841FA00DB2F64 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
                };
-               815C35EC1525203F00502220 /* Build configuration list for PBXAggregateTarget "Project_executables" */ = {
+               812530B50D3FE994006BDF4F /* Build configuration list for PBXAggregateTarget "IPSec Embedded (Aggregate)" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               815C35ED1525203F00502220 /* Development */,
-                               815C35EE1525203F00502220 /* Deployment */,
-                               815C35EF1525203F00502220 /* Default */,
+                               812530B60D3FE994006BDF4F /* Development */,
+                               812530B70D3FE994006BDF4F /* Deployment */,
+                               812530B90D3FE994006BDF4F /* Default */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Default;
+               };
+               812531050D3FE9DC006BDF4F /* Build configuration list for PBXNativeTarget "racoon Embedded" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               812531060D3FE9DC006BDF4F /* Development */,
+                               812531070D3FE9DC006BDF4F /* Deployment */,
+                               812531090D3FE9DC006BDF4F /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
                81DDFDA60D622C1700C5CB87 /* Build configuration list for PBXNativeTarget "setkey Embedded" */ = {
                        isa = XCConfigurationList;
                };
                81DDFDA60D622C1700C5CB87 /* Build configuration list for PBXNativeTarget "setkey Embedded" */ = {
                        isa = XCConfigurationList;
@@ -3166,7 +2989,7 @@
                                81DDFDA90D622C1700C5CB87 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                                81DDFDA90D622C1700C5CB87 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
                81DDFDC90D622C2700C5CB87 /* Build configuration list for PBXNativeTarget "libipsec Embedded" */ = {
                        isa = XCConfigurationList;
                };
                81DDFDC90D622C2700C5CB87 /* Build configuration list for PBXNativeTarget "libipsec Embedded" */ = {
                        isa = XCConfigurationList;
@@ -3176,7 +2999,7 @@
                                81DDFDCC0D622C2700C5CB87 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
                                81DDFDCC0D622C2700C5CB87 /* Default */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Deployment;
+                       defaultConfigurationName = Default;
                };
 /* End XCConfigurationList section */
        };
                };
 /* End XCConfigurationList section */
        };
mirror of ipsec