More craq

[user/henk/code/inspircd.git] / make / gnutlscert.pm

diff --git a/make/gnutlscert.pm b/make/gnutlscert.pm
index d05f6f6a20b0c3c9041b97a93bb0650325c1cb02..77328e2337dd2e03db9d4cb6c085b3b45749dbb5 100644 (file)
--- a/make/gnutlscert.pm
+++ b/make/gnutlscert.pm
@@ -1,5 +1,7 @@
 package make::gnutlscert;
 
+require 5.8.0;
+
 use Exporter 'import';
 use make::configure;
 @EXPORT = qw(make_gnutls_cert);
@@ -9,12 +11,12 @@ sub make_gnutls_cert()
 {
        open (FH, ">certtool.template");
        my $timestr = time();
-       my $org = promptstring("Please enter the organization name", "My IRC Network");
-       my $unit = promptstring("Please enter the unit Name", "Server Admins");
-       my $state = promptstring("Pleae enter your state (two letter code)", "CA");
-       my $country = promptstring("Please enter your country", "Oompa Loompa Land");
-       my $commonname = promptstring("Please enter the certificate common name (hostname)", "irc.mynetwork.com");
-       my $email = promptstring("Please enter a contact email address", "oompa\@loompa.com");
+       my $org = promptstring_s("Please enter the organization name", "My IRC Network");
+       my $unit = promptstring_s("Please enter the unit Name", "Server Admins");
+       my $state = promptstring_s("Pleae enter your state (two letter code)", "CA");
+       my $country = promptstring_s("Please enter your country", "Oompa Loompa Land");
+       my $commonname = promptstring_s("Please enter the certificate common name (hostname)", "irc.mynetwork.com");
+       my $email = promptstring_s("Please enter a contact email address", "oompa\@loompa.com");
        print FH <<__END__;
 # X.509 Certificate options
 #
@@ -106,9 +108,11 @@ ocsp_signing_key
 time_stamping_key
 __END__
 close(FH);
-system("certtool --generate-privkey --outfile key.pem");
-system("certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem --template certtool.template");
+if ( (my $status = system("certtool --generate-privkey --outfile key.pem")) ne 0) { return 1; }
+if ( (my $status = system("certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem --template certtool.template")) ne 0) { return 1; }
 unlink("certtool.template");
+return 0;
 }
 
 1;
+