Skip to contentSkip to conversation

package/ipsec-tools: hybrid config support

PATCH New Doug Kehn 2 participants 2 messages Feb 1, 2015

lore
Share & tools
lore

Doug Kehn

author
#0 lore raw

PATCH 1/1 package/ipsec-tools: hybrid config support

Add config option for enabling hybrid mode. Hybrid mode is required for successful interoperability.

---
 package/ipsec-tools/Config.in      | 6 ++++++
 package/ipsec-tools/ipsec-tools.mk | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
package/ipsec-tools/Config.in +6 -0
index a0d7600..4af4095 100644
@@ -48,6 +48,12 @@ config BR2_PACKAGE_IPSEC_TOOLS_READLINE
 	select BR2_PACKAGE_READLINE
 	bool "Enable readline input support"
 
+config BR2_PACKAGE_IPSEC_TOOLS_HYBRID
+	bool "Enable hybrid, both mode-cfg and xauth support"
+	help
+	  Hybrid mode is required for successful interoperability
+	  (e.g. Cisco VPN Client).
+
 choice
 	prompt "Security context"
 	default BR2_PACKAGE_IPSEC_SECCTX_DISABLE
package/ipsec-tools/ipsec-tools.mk +6 -1
index d916027..56e2bed 100644
@@ -21,7 +21,6 @@ IPSEC_TOOLS_CONF_ENV += LIBS=-lz
 endif
 
 IPSEC_TOOLS_CONF_OPTS = \
-	  --disable-hybrid \
 	  --without-libpam \
 	  --disable-gssapi \
 	  --with-kernel-headers=$(STAGING_DIR)/usr/include
@@ -62,6 +61,12 @@ else
 IPSEC_DEPENDENCIES += readline
 endif
 
+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_HYBRID), y)
+IPSEC_TOOLS_CONF_OPTS += --enable-hybrid
+else
+IPSEC_TOOLS_CONF_OPTS += --disable-hybrid
+endif
+
 ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y)
 IPSEC_TOOLS_CONF_OPTS += --enable-security-context=no
 endif
Signature · 1 line
2.2.2
#1 lore raw

PATCH 1/1 package/ipsec-tools: hybrid config support

Dear Doug Kehn,

Quoted 8 lines · Doug Kehn

Add config option for enabling hybrid mode. Hybrid mode is required for successful interoperability.

---
 package/ipsec-tools/Config.in      | 6 ++++++
 package/ipsec-tools/ipsec-tools.mk | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

Applied, thanks. I originally wondered if we shouldn't simply enable this option by default, since it doesn't require any external dependency. However, there are already several ipsec-tools options that exist without having external dependencies, so the addition of this new option continues in the same logic.

Quoted 1 line

+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_HYBRID), y)

I've committed a follow-up patch to replace ', y' by ',y' which is what we use everywhere in Buildroot.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com