From b64fe8320ecbcc3f6099a3c0ae1b2739447bfc76 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sat, 26 Sep 2020 23:32:09 +0100 Subject: Store generated SSL certificates in the .configure directory. Co-Authored-By: Nicole Kleinhoff --- tools/genssl | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/genssl b/tools/genssl index 930f4b1d7..f4c38fd2e 100755 --- a/tools/genssl +++ b/tools/genssl @@ -31,10 +31,18 @@ use File::Temp(); # IMPORTANT: This script has to be able to run by itself so that it can be used # by binary distributions where the make/console.pm module will not # be available! +eval { + use File::Basename qw(dirname); + use FindBin qw($RealDir); + + use lib dirname $RealDir; + require make::console; + make::console->import(); +}; sub prompt($$) { my ($question, $default) = @_; - return prompt_string(1, $question, $default) if eval 'use File::Basename; use FindBin; use lib dirname($FindBin::RealDir); use make::console; 1'; + return prompt_string(1, $question, $default) if defined main->can('prompt_string'); say $question; print "[$default] => "; chomp(my $answer = ); @@ -42,8 +50,8 @@ sub prompt($$) { return $answer ? $answer : $default; } -if ($#ARGV != 0 || $ARGV[0] !~ /^(?:auto|gnutls|openssl)$/i) { - say STDERR "Usage: $0 "; +if (scalar @ARGV < 1 || $ARGV[0] !~ /^(?:auto|gnutls|openssl)$/i) { + say STDERR "Usage: $0 [SSL-DIR]"; exit 1; } @@ -75,6 +83,12 @@ if ($tool eq 'auto') { exit 1; } +# Output to the cwd unless an SSL directory is specified. +if (scalar @ARGV > 1 && !chdir $ARGV[1]) { + say STDERR "Unable to change the working directory to $ARGV[1]: $!."; + exit 1; +} + # Harvest information needed to generate the certificate. my $common_name = prompt('What is the hostname of your server?', 'irc.example.com'); my $email = prompt('What email address can you be contacted at?', 'example@example.com'); -- cgit v1.2.3