X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fgenssl;h=930f4b1d71e35b5690ca6b297a18ef631fc82734;hb=9cdd7c70ee8faa2d8d37078aa188423a7abfa214;hp=739f7fc7d82adc3ffd200fa3d85397d1f816ff9f;hpb=e3303330f8cc04121907715d789370f492878646;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/tools/genssl b/tools/genssl
index 739f7fc7d..930f4b1d7 100755
--- a/tools/genssl
+++ b/tools/genssl
@@ -2,9 +2,7 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
-#   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
-#   Copyright (C) 2013 Peter Powell <petpow@saberuk.com>
+#   Copyright (C) 2013-2017, 2020 Sadie Powell <sadie@witchery.services>
 #
 # 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
@@ -31,12 +29,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 File::Basename; use FindBin; use lib dirname($FindBin::RealDir); use make::console; 1';
 	say $question;
 	print "[$default] => ";
 	chomp(my $answer = <STDIN>);
@@ -45,7 +43,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;
 }
 
@@ -87,9 +85,6 @@ 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;
 
@@ -119,8 +114,8 @@ __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') {
 	my $tmp = new File::Temp();
 	print $tmp <<__OPENSSL_END__;
@@ -131,22 +126,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) {
 	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);
-	say '';
-	say 'Add this TLSA record to your domain for DANE support:';
-	say "_6697._tcp." . $common_name . " TLSA 3 0 1 " . $hash->hexdigest;
-}