From 481178daaa9ccfae950c4c5df36d90933d575420 Mon Sep 17 00:00:00 2001
From: icydoge <icydoge@gmail.com>
Date: Wed, 9 May 2018 19:01:47 +0100
Subject: [PATCH] Bug: Fix incorrect certtool being called on macOS/Mac OS X
Apple rolls their own certtool on macOS/Mac OS X, which is distinct from
the correct gnutls-certtool from gnutls installed by Homebrew/MacPorts.
---
lib/leap_cli/commands/cert.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/leap_cli/commands/cert.rb b/lib/leap_cli/commands/cert.rb
index 68fa9444..6d963686 100644
--- a/lib/leap_cli/commands/cert.rb
+++ b/lib/leap_cli/commands/cert.rb
@@ -132,7 +132,11 @@ module LeapCli; module Commands
long_running do
if cmd_exists?('certtool')
log 0, 'Generating DH parameters (takes a long time)...'
- output = assert_run!('certtool --generate-dh-params --sec-param high')
+ if (/darwin/ =~ RUBY_PLATFORM) != nil
+ output = assert_run!('gnutls-certtool --generate-dh-params --sec-param high')
+ else
+ output = assert_run!('certtool --generate-dh-params --sec-param high')
+ end
output.sub!(/.*(-----BEGIN DH PARAMETERS-----.*-----END DH PARAMETERS-----).*/m, '\1')
output << "\n"
write_file!(:dh_params, output)
--
GitLab