X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fgnutlscert.pm;h=a67be0cfdac005981f23c31adb0f5e1bd9a5e330;hb=67822c67e91e70917ddbdec0bd8453c7170ee06d;hp=1621c2c274566e5ca78715fd907dbc21be3665f7;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/gnutlscert.pm b/make/gnutlscert.pm
index 1621c2c27..a67be0cfd 100644
--- a/make/gnutlscert.pm
+++ b/make/gnutlscert.pm
@@ -36,7 +36,7 @@ sub make_gnutls_cert()
 	my $timestr = time();
 	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 $state = promptstring_s("Please 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");
@@ -131,8 +131,14 @@ ocsp_signing_key
 time_stamping_key
 __END__
 close(FH);
-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; }
+my $certtool = "certtool";
+if (`uname -s` eq "Darwin\n") {
+	# On OS X the certtool binary name is different to prevent
+	# collisions with the system certtool from NSS.
+	$certtool = "gnutls-certtool";
+}
+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;
 }