X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fopensslcert.pm;h=20da704f72434f3d8230c8489f7990a1bbfc372f;hb=95c5aa91953db978879ec21c236a871257fe7036;hp=b8c9d164fbaff2ebfd99a146b916327878f7a7a8;hpb=284925bed5034712973eda6d42a604b4d07297d0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/opensslcert.pm b/make/opensslcert.pm
index b8c9d164f..20da704f7 100644
--- a/make/opensslcert.pm
+++ b/make/opensslcert.pm
@@ -32,6 +32,11 @@ our @EXPORT = qw(make_openssl_cert);
 
 sub make_openssl_cert()
 {
+	if (system 'openssl version >/dev/null 2>&1')
+	{
+		print "\e[1;31mCertificate generation failed:\e[0m unable to find 'openssl' in the PATH!\n";
+		return;
+	}
 	open (FH, ">openssl.template");
 	my $commonname = promptstring_s('What is the hostname of your server?', 'irc.example.com');
 	my $email = promptstring_s('What email address can you be contacted at?', 'example@example.com');
@@ -41,6 +46,7 @@ sub make_openssl_cert()
 	my $state = promptstring_s('What state are you located in?', 'Example State');
 	my $country = promptstring_s('What is the ISO 3166-1 code for the country you are located in?', 'XZ');
 	my $time = promptstring_s('How many days do you want your certificate to be valid for?', '365');
+	my $use_1024 = promptstring_s('Do you want to generate less secure dhparams which are compatible with old versions of Java?', 'n');
 	print FH <<__END__;
 $country
 $state
@@ -51,8 +57,9 @@ $commonname
 $email
 __END__
 close(FH);
-system("cat openssl.template | openssl req -x509 -nodes -newkey rsa:1024 -keyout key.pem -out cert.pem -days $time 2>/dev/null");
-system("openssl dhparam -out dhparams.pem 1024");
+my $dhbits = $use_1024 =~ /^(1|on|true|yes|y)$/ ? 1024 : 2048;
+system("cat openssl.template | openssl req -x509 -nodes -newkey rsa:2048 -keyout key.pem -out cert.pem -days $time 2>/dev/null");
+system("openssl dhparam -out dhparams.pem $dhbits");
 unlink("openssl.template");
 }