Add Perl module for console related code.

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

diff --git a/tools/genssl b/tools/genssl
index aa8d48300d5aeabab40123cf666a7b501ab8b38d..13b1f01fc9d6d1f928c6b99654633c19453740bd 100755 (executable)
--- a/tools/genssl
+++ b/tools/genssl
@@ -35,6 +35,7 @@ use File::Temp();
 
 sub prompt($$) {
        my ($question, $default) = @_;
+       return prompt_string(1, $question, $default) if eval 'use make::console; 1';
        print "$question\n";
        print "[$default] => ";
        chomp(my $answer = <STDIN>);
@@ -51,7 +52,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.
@@ -92,6 +93,8 @@ my $dercert;
 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,9 +116,9 @@ 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";
+       $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();