[ptxdist] [PATCH 10/19] mosh: make the crypto library configurable

[Clemens Gruber <clemens.gruber@pqgruber.com>]

Mosh supports OpenSSL and Nettle. Let the user decide, but default to
OpenSSL, which was hardcoded before.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/mosh.in   | 25 +++++++++++++++++++++++--
 rules/mosh.make |  2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/rules/mosh.in b/rules/mosh.in
index 49ace4a35..398917fc7 100644
--- a/rules/mosh.in
+++ b/rules/mosh.in
@@ -1,12 +1,13 @@
 ## SECTION=networking
 
-config MOSH
+menuconfig MOSH
 	tristate
 	prompt "mosh"
 	select PROTOBUF
 	select NCURSES
 	select ZLIB
-	select OPENSSL
+	select NETTLE		if MOSH_NETTLE
+	select OPENSSL		if MOSH_OPENSSL
 	select OPENSSH		if RUNTIME
 	select OPENSSH_SSH	if RUNTIME
 	select OPENSSH_SSHD	if RUNTIME
@@ -15,3 +16,23 @@ config MOSH
 	  connectivity, and provides intelligent local echo and line editing of
 	  user keystrokes. Mosh is a replacement for SSH. It's more robust and
 	  responsive, especially over Wi-Fi, cellular, and long-distance links.
+
+if MOSH
+
+choice
+	prompt "crypto library"
+	default MOSH_OPENSSL
+	help
+	  Select the crypto library to be used
+
+	config MOSH_NETTLE
+		bool
+		prompt "nettle"
+
+	config MOSH_OPENSSL
+		bool
+		prompt "openssl"
+
+endchoice
+
+endif
diff --git a/rules/mosh.make b/rules/mosh.make
index 4fec37973..fe4b027f9 100644
--- a/rules/mosh.make
+++ b/rules/mosh.make
@@ -41,7 +41,7 @@ MOSH_CONF_OPT	:= \
 	--without-utempter \
 	--with-ncurses \
 	--without-ncursesw \
-	--with-crypto-library=openssl
+	--with-crypto-library=$(call ptx/ifdef, PTXCONF_MOSH_NETTLE, nettle, openssl)
 
 
 # ----------------------------------------------------------------------------
-- 
2.14.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de