ipsec-164.10.tar.gz

diff --git a/ipsec-tools/racoon/isakmp_frag.h b/ipsec-tools/racoon/isakmp_frag.h
index f6c920a1c46b794b4f17e637d6781d474ace407d..0ddab52929500abb7be31a59696e413a1570dc58 100644 (file)
--- a/ipsec-tools/racoon/isakmp_frag.h
+++ b/ipsec-tools/racoon/isakmp_frag.h
@@ -36,7 +36,7 @@
 
 /* These are the values from parsing "remote {}"
    block of the config file. */
 
 /* These are the values from parsing "remote {}"
    block of the config file. */

-#define ISAKMP_FRAG_OFF                FLASE   /* = 0 */
+#define ISAKMP_FRAG_OFF                FALSE   /* = 0 */

 #define ISAKMP_FRAG_ON         TRUE    /* = 1 */
 #define ISAKMP_FRAG_FORCE      2
 
 #define ISAKMP_FRAG_ON         TRUE    /* = 1 */
 #define ISAKMP_FRAG_FORCE      2
 

diff --git a/ipsec-tools/racoon/remoteconf.c b/ipsec-tools/racoon/remoteconf.c
index 0a0d27758ed026af6ea42bbab9fe60b7918e0230..7e973561ae476e9e43f0d888f1db4ae06fe27378 100644 (file)
--- a/ipsec-tools/racoon/remoteconf.c
+++ b/ipsec-tools/racoon/remoteconf.c
@@ -314,7 +314,7 @@ newrmconf()
        new->idvl_p = genlist_init();
        new->nonce_size = DEFAULT_NONCE_SIZE;
        new->passive = FALSE;
        new->idvl_p = genlist_init();
        new->nonce_size = DEFAULT_NONCE_SIZE;
        new->passive = FALSE;

-       new->ike_frag = ISAKMP_FRAG_FORCE;
+       new->ike_frag = ISAKMP_FRAG_ON;

        new->esp_frag = IP_MAXPACKET;
        new->ini_contact = TRUE;
        new->mode_cfg = FALSE;
        new->esp_frag = IP_MAXPACKET;
        new->ini_contact = TRUE;
        new->mode_cfg = FALSE;

diff --git a/ipsec.xcodeproj/project.pbxproj b/ipsec.xcodeproj/project.pbxproj
index 9f7530d89e38fb6e90da3ee9b9c3ceefc0a2b3ed..3243a0c846cd1112e55488a278a95741a14a6e21 100644 (file)
--- a/ipsec.xcodeproj/project.pbxproj
+++ b/ipsec.xcodeproj/project.pbxproj
@@ -2378,6 +2378,7 @@
                                ADDITIONAL_SDKS = "";
                                ARCHS = (
                                        armv7,
                                ADDITIONAL_SDKS = "";
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                COPY_PHASE_STRIP = NO;
                                OTHER_CFLAGS = "";
                                );
                                COPY_PHASE_STRIP = NO;
                                OTHER_CFLAGS = "";


@@ -2400,6 +2401,7 @@
                                ADDITIONAL_SDKS = "";
                                ARCHS = (
                                        armv7,
                                ADDITIONAL_SDKS = "";
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                COPY_PHASE_STRIP = NO;
                                OTHER_CFLAGS = "";
                                );
                                COPY_PHASE_STRIP = NO;
                                OTHER_CFLAGS = "";


@@ -2423,6 +2425,7 @@
                                ARCHS = "";
                                "ARCHS[arch=*]" = (
                                        armv7,
                                ARCHS = "";
                                "ARCHS[arch=*]" = (
                                        armv7,

+                                       armv7s,

                                );
                                COPY_PHASE_STRIP = NO;
                                OTHER_CFLAGS = "";
                                );
                                COPY_PHASE_STRIP = NO;
                                OTHER_CFLAGS = "";


@@ -2448,6 +2451,7 @@
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";
                                );
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";


@@ -2511,6 +2515,7 @@
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";
                                );
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";


@@ -2571,6 +2576,7 @@
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";
                                );
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";


@@ -2631,6 +2637,7 @@
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                COPY_PHASE_STRIP = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                );
                                COPY_PHASE_STRIP = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;


@@ -2672,6 +2679,7 @@
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                COPY_PHASE_STRIP = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                );
                                COPY_PHASE_STRIP = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;


@@ -2713,6 +2721,7 @@
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                );
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;


@@ -2795,6 +2804,7 @@
                        buildSettings = {
                                ARCHS = (
                                        armv7,
                        buildSettings = {
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                COPY_PHASE_STRIP = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                );
                                COPY_PHASE_STRIP = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;


@@ -2838,6 +2848,7 @@
                        buildSettings = {
                                ARCHS = (
                                        armv7,
                        buildSettings = {
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                COPY_PHASE_STRIP = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                );
                                COPY_PHASE_STRIP = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;


@@ -2880,6 +2891,7 @@
                        buildSettings = {
                                ARCHS = (
                                        armv7,
                        buildSettings = {
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                );
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;


@@ -2923,6 +2935,7 @@
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                );
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";


@@ -2964,6 +2977,7 @@
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                );
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";


@@ -3002,6 +3016,7 @@
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,
                                ALTERNATE_OWNER = "$(inherited)";
                                ARCHS = (
                                        armv7,

+                                       armv7s,

                                );
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                );
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";