deprecated/phpki-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check country code and try to fix DH warnings

Browse Source
This commit is contained in:
John Crisp
2020-03-03 17:34:20 +01:00
parent 32b75d6c4a
commit 67eb377781
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
setup.php-presetup
View File

@@ -117,6 +117,12 @@ case 'validate':
if (! $passwd_file) $er .= 'Missing User Password File Location'; if (! $passwd_file) $er .= 'Missing User Password File Location';
if (! $store_dir) $er .= 'Missing Storage Directory<br>'; if (! $store_dir) $er .= 'Missing Storage Directory<br>';
$countrycode = strtoupper($country);
if (! preg_match("/\b[A-Z][A-Z]\b/", $countrycode, $match) ) {
$er .= 'Country Code must be ISO 3166 two letters <br>';
}
if ( $passwd && strlen($passwd) < 8 ) if ( $passwd && strlen($passwd) < 8 )
$er .= 'Certificate password is too short.<br>'; $er .= 'Certificate password is too short.<br>';
@@ -286,7 +292,8 @@ define('PKCS12', "RANDFILE='\$config[random]' " . OPENSSL . ' pkcs12 ');
define('CA', OPENSSL . ' ca '); define('CA', OPENSSL . ' ca ');
define('REQ', OPENSSL . ' req '); define('REQ', OPENSSL . ' req ');
define('CRL', OPENSSL . ' crl '); define('CRL', OPENSSL . ' crl ');
define('DH', OPENSSL . ' dhparam ');
# define('DH', OPENSSL . ' dhparam ' . "RANDFILE='$config[random]' ");
?> ?>
EOS; EOS;
@@ -596,7 +603,7 @@ EOS;
# #
print '<strong>Creating root certificate...</strong><br>'; print '<strong>Creating root certificate...</strong><br>';
flush(); flush();
// .rnd created here
exec(REQ . " -x509 -config $tmp_cnf -extensions root_ext -newkey rsa:$keysize -keyout $config[cakey] -out $config[cacert_pem] -passout pass:'$config[ca_pwd]' -days $days 2>&1"); exec(REQ . " -x509 -config $tmp_cnf -extensions root_ext -newkey rsa:$keysize -keyout $config[cakey] -out $config[cacert_pem] -passout pass:'$config[ca_pwd]' -days $days 2>&1");
# **** DISABLED ***** # **** DISABLED *****
@@ -626,13 +633,17 @@ EOS;
# Create dhparam files for OpenVPN and others. # Create dhparam files for OpenVPN and others.
# #
print '<p><strong>Creating 1024 bit Diffie-Hellman parameters used by OpenVPN.<br>'; print '<p><strong>Creating 1024 bit Diffie-Hellman parameters used by OpenVPN.<br>';
print "Saving to $store_dir/dhparam1024.pem.</strong><br>"; print "Saving to $config[private_dir]/dhparam1024.pem.</strong><br>";
$cmd = "openssl dhparam -rand '$config[random]' -out '$config[private_dir]/dhparam1024.pem' 1024"; // $cmd = "openssl dhparam -rand '$config[random]' -out '$config[private_dir]/dhparam1024.pem' 1024";
print $cmd.'<br>'; // print $cmd.'<br>';
// This works but still the error
exec(DH . "-rand '$config[random]' -out '$config[private_dir]/dhparam1024.pem' 1024");
// exec(DH . " -out '$config[private_dir]/dhparam1024.pem' 1024");
flush(); flush();
flush_exec($cmd,100); //flush_exec($cmd,100);
print "Please ignore warnings about \"unable to write 'random state'\"<br>";
print "Please ignore warnings about \"unable to write 'random state\' <br><br>";
# #
# Create a TLS auth key for OpenVPN if openvpn is installed # Create a TLS auth key for OpenVPN if openvpn is installed
@@ -794,7 +805,7 @@ E-mail: <a href=mailto:someone@somewhere.com>someone@somewhere.com</a>&nbsp;&nbs
</tr> </tr>
<tr> <tr>
<td><strong>Country</strong> <font color=red>*</font></td> <td><strong>Country Code ISO 3166 - 2 Characters</strong> <font color=red>*</font></td>
<td><input type=text name=country value="<?php echo htvar($country)?>" maxlength=2 size=2></td> <td><input type=text name=country value="<?php echo htvar($country)?>" maxlength=2 size=2></td>
</tr> </tr>