Merge pull request #1271 from SaberUK/master+exemption

[user/henk/code/inspircd.git] / tools / genssl

diff --git a/tools/genssl b/tools/genssl
index 739f7fc7d82adc3ffd200fa3d85397d1f816ff9f..e4d5bf1f40b11190cb4351963b0829bd528d3ceb 100755 (executable)
--- a/tools/genssl
+++ b/tools/genssl
@@ -31,12 +31,12 @@ use warnings FATAL => qw(all);
 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/utilities.pm module will not
+#            by binary distributions where the make/console.pm module will not
 #            be available!
 
 sub prompt($$) {
        my ($question, $default) = @_;
-       return prompt_string(1, $question, $default) if eval 'use make::console; 1';
+       return prompt_string(1, $question, $default) if eval 'use FindBin;use lib $FindBin::RealDir;use make::console; 1';
        say $question;
        print "[$default] => ";
        chomp(my $answer = <STDIN>);
@@ -45,7 +45,7 @@ sub prompt($$) {
 }
 
 if ($#ARGV != 0 || $ARGV[0] !~ /^(?:auto|gnutls|openssl)$/i) {
-       say 'Syntax: genssl <auto|gnutls|openssl>';
+       say STDERR "Usage: $0 <auto|gnutls|openssl>";
        exit 1;
 }
 
@@ -119,6 +119,7 @@ __GNUTLS_END__
        close($tmp);
        $status ||= system "$certtool --generate-privkey $sec_param --outfile key.pem";
        $status ||= system "$certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem --template $tmp";
+       $status ||= system "$certtool --generate-request --load-privkey key.pem --outfile csr.pem --template $tmp";
        $status ||= system "$certtool --generate-dh-params $sec_param --outfile dhparams.pem";
        $dercert = `$certtool --certificate-info --infile cert.pem --outder` unless $status;
 } elsif ($tool eq 'openssl') {
@@ -131,9 +132,12 @@ $organization
 $unit
 $common_name
 $email
+.
+$organization
 __OPENSSL_END__
        close($tmp);
        $status ||= system "cat $tmp | openssl req -x509 -nodes -newkey rsa:2048 -keyout key.pem -out cert.pem -days $days 2>/dev/null";
+       $status ||= system "cat $tmp | openssl req -new -nodes -key key.pem -out csr.pem 2>/dev/null";
        $status ||= system 'openssl dhparam -out dhparams.pem 2048';
        $dercert = `openssl x509 -in cert.pem -outform DER` unless $status;
 }
@@ -147,6 +151,6 @@ if (defined $dercert && eval 'use Digest::SHA; 1') {
        my $hash = Digest::SHA->new(256);
        $hash->add($dercert);
        say '';
-       say 'Add this TLSA record to your domain for DANE support:';
+       say 'If you are using the self-signed certificate then add this TLSA record to your domain for DANE support:';
        say "_6697._tcp." . $common_name . " TLSA 3 0 1 " . $hash->hexdigest;
 }