X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=a66a71dc2acab00be511692f34db54e9f1317e78;hb=ea75fb5c4c0ae8a5374129bf1ba45ec6d5646ca5;hp=db0dd70e0bfde3d3b89979a842a485eb47db90a6;hpb=772dc6c47406b0ca6be5e49914dd739c8d580bd5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index db0dd70e0..a66a71dc2 100755
--- a/configure
+++ b/configure
@@ -24,6 +24,8 @@ use Getopt::Long;
 # Utility functions for our buildsystem
 use make::utilities;
 use make::configure;
+use make::gnutlscert;
+use make::opensslcert;
 
 GetOptions (
 	'enable-gnutls' => \$opt_use_gnutls,
@@ -703,11 +705,10 @@ if ($config{USE_GNUTLS} eq "y") {
 * Generating the Private Key may take some time, go grab a  *
 * Coffee. Even better, to generate some more entropy if it  *
 * is taking a while, open another console and type du / a   *
-* few times and get that HD going :) Then answer the	*
+* few times and get that HD going :) Then answer the        *
 * Questions which follow. If you are unsure, just hit enter *
 *************************************************************\n\n";
-			system("certtool --generate-privkey --outfile key.pem");
-			system("certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem");
+			make_gnutls_cert();
 			print "\nCertificate generation complete, copying to config directory... ";
 			system("mv key.pem $config{CONFIG_DIR}/key.pem");
 			system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
@@ -742,10 +743,9 @@ if ($config{USE_GNUTLS} eq "y") {
 			print "SSL Certificates Not found, Generating.. \n\n
 *************************************************************
 * Generating the certificates may take some time, go grab a *
-* coffee, or something.				     *
+* coffee, or something.                                     *
 *************************************************************\n\n";
-			system("openssl req -x509 -nodes -newkey rsa:1024 -keyout key.pem -out cert.pem");
-			system("openssl dhparam -out dhparams.pem 1024");
+			make_openssl_cert();
 			print "\nCertificate generation complete, copying to config directory... ";
 			system("mv key.pem $config{CONFIG_DIR}/key.pem");
 			system("mv cert.pem $config{CONFIG_DIR}/cert.pem");