X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=tools%2Fgenssl;h=aab8ce553f9554c6f7f1dc6a50276635551422d9;hb=a235e4356074f10b6946ee4019769a707f4f6e1d;hp=aa8d48300d5aeabab40123cf666a7b501ab8b38d;hpb=caa987d0deb0709af6e3a2c7056ac6136c43fa78;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/tools/genssl b/tools/genssl index aa8d48300..aab8ce553 100755 --- a/tools/genssl +++ b/tools/genssl @@ -2,9 +2,8 @@ # # InspIRCd -- Internet Relay Chat Daemon # -# Copyright (C) 2007 Dennis Friis -# Copyright (C) 2007 Craig Edwards -# Copyright (C) 2013 Peter Powell +# Copyright (C) 2020 Nicole Kleinhoff +# Copyright (C) 2013-2017, 2020 Sadie Powell # # This file is part of InspIRCd. InspIRCd is free software: you can # redistribute it and/or modify it under the terms of the GNU General Public @@ -20,30 +19,36 @@ # -BEGIN { - require 5.8.0; -} - +use v5.10.0; use strict; 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! +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) = @_; - print "$question\n"; + return prompt_string(1, $question, $default) if defined main->can('prompt_string'); + say $question; print "[$default] => "; chomp(my $answer = ); - print "\n"; + say ''; return $answer ? $answer : $default; } -if ($#ARGV != 0 || $ARGV[0] !~ /^(?:auto|gnutls|openssl)$/i) { - print "Syntax: genssl \n"; +if (scalar @ARGV < 1 || $ARGV[0] !~ /^(?:auto|gnutls|openssl)$/i) { + say STDERR "Usage: $0 [SSL-DIR]"; exit 1; } @@ -51,7 +56,7 @@ if ($#ARGV != 0 || $ARGV[0] !~ /^(?:auto|gnutls|openssl)$/i) { my $certtool = $^O eq 'darwin' ? 'gnutls-certtool' : 'certtool'; # Check whether the user has the required tools installed. -my $has_gnutls = !system "$certtool --version >/dev/null 2>&1"; +my $has_gnutls = `$certtool --version v 2>/dev/null`; my $has_openssl = !system 'openssl version >/dev/null 2>&1'; # The framework the user has specified. @@ -64,14 +69,20 @@ if ($tool eq 'auto') { } elsif ($has_openssl) { $tool = 'openssl'; } else { - print STDERR "SSL generation failed: could not find $certtool or openssl in the PATH!\n"; + say STDERR "SSL generation failed: could not find $certtool or openssl in the PATH!"; exit 1; } } elsif ($tool eq 'gnutls' && !$has_gnutls) { - print STDERR "SSL generation failed: could not find '$certtool' in the PATH!\n"; + say STDERR "SSL generation failed: could not find '$certtool' in the PATH!"; exit 1; } elsif ($tool eq 'openssl' && !$has_openssl) { - print STDERR "SSL generation failed: could not find 'openssl' in the PATH!\n"; + say STDERR 'SSL generation failed: could not find \'openssl\' in the PATH!'; + 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; } @@ -85,13 +96,12 @@ my $state = prompt('What state are you located in?', 'Example State'); my $country = prompt('What is the ISO 3166-1 code for the country you are located in?', 'XZ'); my $days = prompt('How many days do you want your certificate to be valid for?', '365'); -# Contains the SSL certificate in DER form. -my $dercert; - # Contains the exit code of openssl/gnutls-certtool. my $status = 0; if ($tool eq 'gnutls') { + $has_gnutls =~ /certtool.+?(\d+\.\d+)/; + my $sec_param = $1 lt '2.10' ? '--bits 2048' : '--sec-param normal'; my $tmp = new File::Temp(); print $tmp <<__GNUTLS_END__; cn = "$common_name" @@ -113,10 +123,10 @@ ocsp_signing_key time_stamping_key __GNUTLS_END__ close($tmp); - $status ||= system "$certtool --generate-privkey --outfile key.pem"; + $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-dh-params --bits 2048 --outfile dhparams.pem"; - $dercert = `$certtool --certificate-info --infile cert.pem --outder` unless $status; + $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"; } elsif ($tool eq 'openssl') { my $tmp = new File::Temp(); print $tmp <<__OPENSSL_END__; @@ -127,21 +137,16 @@ $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; } if ($status) { - print STDERR "SSL generation failed: $tool exited with a non-zero status!\n"; + say STDERR "SSL generation failed: $tool exited with a non-zero status!"; exit 1; } - -if (defined $dercert && eval 'use Digest::SHA; 1') { - my $hash = Digest::SHA->new(256); - $hash->add($dercert); - print "\nAdd this TLSA record to your domain for DANE support:\n"; - print "_6697._tcp." . $common_name . " TLSA 3 0 1 " . $hash->hexdigest . "\n"; -}