ipsec-332.100.1.tar.gz

diff --git a/ipsec-tools/Common/pfkey_dump.c b/ipsec-tools/Common/pfkey_dump.c
index 28335448dbc4a1fe7f72224bd72d9b4f70526de6..273021a31d83a4db8cc41ef09abef65b3c61eb4f 100644 (file)
--- a/ipsec-tools/Common/pfkey_dump.c
+++ b/ipsec-tools/Common/pfkey_dump.c
@@ -196,6 +196,12 @@ static struct val2str str_alg_enc[] = {
 #endif
 #ifdef SADB_X_EALG_AESCTR
        { SADB_X_EALG_AESCTR, "aes-ctr", },
+#endif
+#ifdef SADB_X_EALG_AES_GCM
+       { SADB_X_EALG_AES_GCM, "aes-gcm", },
+#endif
+#ifdef SADB_X_EALG_CHACHA20POLY1305
+       { SADB_X_EALG_CHACHA20POLY1305, "chacha20-poly1305", },
 #endif
        { -1, NULL, },
 };

diff --git a/ipsec.xcodeproj/project.pbxproj b/ipsec.xcodeproj/project.pbxproj
index 84809d969980d4be11e78e1cf25e5919e0d3d8a3..1ba5974501d6fba4150d626e8271fe6c9b6bff01 100644 (file)
--- a/ipsec.xcodeproj/project.pbxproj
+++ b/ipsec.xcodeproj/project.pbxproj
@@ -2500,7 +2500,7 @@
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "$(inherited)";
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
-                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_IDENTITY = "-";
                                COPY_PHASE_STRIP = NO;
                                FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2556,7 +2556,7 @@
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "$(inherited)";
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
-                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_IDENTITY = "-";
                                COPY_PHASE_STRIP = NO;
                                DSTROOT = "/tmp/$(PROJECT_NAME).dst";
                                FRAMEWORK_SEARCH_PATHS = "";
@@ -2609,7 +2609,7 @@
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "$(inherited)";
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
-                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_IDENTITY = "-";
                                COPY_PHASE_STRIP = NO;
                                DSTROOT = "/tmp/$(PROJECT_NAME).dst";
                                FRAMEWORK_SEARCH_PATHS = "";
@@ -2660,7 +2660,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_IDENTITY = "-";
                                COPY_PHASE_STRIP = NO;
                                FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2701,7 +2701,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_IDENTITY = "-";
                                COPY_PHASE_STRIP = YES;
                                FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2741,7 +2741,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_IDENTITY = "-";
                                FRAMEWORK_SEARCH_PATHS = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
@@ -2781,7 +2781,7 @@
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_IDENTITY = "-";
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
@@ -2818,7 +2818,7 @@
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_IDENTITY = "-";
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;
@@ -2852,7 +2852,7 @@
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_IDENTITY = "-";
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
                                DYLIB_CURRENT_VERSION = 300;