phpki-ng/contribs10/phpki-ng-0.84-fix-crl.patch

diff -ruN phpki-ng.old/phpki-ng-0.84/include/openssl_functions.php phpki-ng/phpki-ng-0.84/include/openssl_functions.php
--- phpki-ng.old/phpki-ng-0.84/include/openssl_functions.php    2021-03-08 18:40:56.679933225 +0100
+++ phpki-ng/phpki-ng-0.84/include/openssl_functions.php        2021-03-08 18:52:22.703152756 +0100
@@ -885,7 +885,7 @@
     if ($ret == 0) {
         unset($cmd_output);
         $cmd_output[] = "Creating DER format Certificate Revocation List.";
-        exec(CRL." -in '$configCacrl_der' -out '$configCacrl_der' -inform PEM -outform DER 2>&1", $cmd_output, $ret);
+        exec(CRL." -in '$configCacrl_pem' -out '$configCacrl_der' -inform PEM -outform DER 2>&1", $cmd_output, $ret);
     }
 
     return array(($ret == 0 ? true : false), implode('<br>', $cmd_output));
diff -ruN phpki-ng.old/phpki-ng-0.84/setup.php-presetup phpki-ng/phpki-ng-0.84/setup.php-presetup
--- phpki-ng.old/phpki-ng-0.84/setup.php-presetup       2021-03-08 18:40:56.645932734 +0100
+++ phpki-ng/phpki-ng-0.84/setup.php-presetup   2021-03-08 18:52:22.704152770 +0100
@@ -692,7 +692,7 @@
         #
         # Create a new self-signed CA certificate in PEM format.
         #
-        print '<strong>Creating root certificate...</strong><br>';
+        print '<strong>Creating root certificate... '. $keysize .' bits</strong><br>';
         flush();
 
         $configOpenssl_cnf = $config['openssl_cnf'];
@@ -773,7 +773,7 @@
         } else {
             echo "openvpn is required to generate a takey.pem<br>";
             echo "You can create one later like this:<br>";
-            echo "openvpn --genkey --secret". $configPrivate_dir . "/takey.pem<br>";
+            echo "openvpn --genkey --secret ". $configPrivate_dir . "/takey.pem<br>";
         }
 
 
@@ -949,7 +949,10 @@
     <tr>
     <th colspan=2><h3>Root Certificate Data</h3></th>
     </tr>
-
+    <tr>
+    <td/><h4><font color=red>* Required field</font></h4></td>
+    <td>&nbsp;</td>
+    </tr>
     <tr>
     <td width=35%><strong>Organization</strong> <font color=red>*</font></td>
     <td><input type=text name=organization value="<?php echo htvar($organization)?>" maxlength=60 size=50></td>
@@ -1218,12 +1221,20 @@
     </td>
     </tr>
     </table>
-    <font color=red>* Required field</font>
 
+    <font color=red>* Required field</font>
+    <p><center><font color=red>Please click the Submit button ONCE and be patient.</font><br />
+       This may take a few minutes. Please do not interrupt the process.....</center>
+    </p>
+
+    <p><center><font color=red>Please click the Submit button ONCE and be patient.</font><br />
+       This may take a few minutes. Please do not interrupt the process.....</center>
+    </p>
     <p>
-    <center><input type=submit name=submit value=Submit></center></td>
+    <center><input style="border: 1px solid red; padding: 10px;" type=submit name=submit value=Submit></center>
     <input type=hidden name=stage value='validate'>
     </form>
+    </p>
 
     <?php
     printFooter();
1	diff -ruN phpki-ng.old/phpki-ng-0.84/include/openssl_functions.php phpki-ng/phpki-ng-0.84/include/openssl_functions.php
2	--- phpki-ng.old/phpki-ng-0.84/include/openssl_functions.php 2021-03-08 18:40:56.679933225 +0100
3	+++ phpki-ng/phpki-ng-0.84/include/openssl_functions.php 2021-03-08 18:52:22.703152756 +0100
4	@@ -885,7 +885,7 @@
5	if ($ret == 0) {
6	unset($cmd_output);
7	$cmd_output[] = "Creating DER format Certificate Revocation List.";
8	- exec(CRL." -in '$configCacrl_der' -out '$configCacrl_der' -inform PEM -outform DER 2>&1", $cmd_output, $ret);
9	+ exec(CRL." -in '$configCacrl_pem' -out '$configCacrl_der' -inform PEM -outform DER 2>&1", $cmd_output, $ret);
10	}
11
12	return array(($ret == 0 ? true : false), implode('<br>', $cmd_output));
13	diff -ruN phpki-ng.old/phpki-ng-0.84/setup.php-presetup phpki-ng/phpki-ng-0.84/setup.php-presetup
14	--- phpki-ng.old/phpki-ng-0.84/setup.php-presetup 2021-03-08 18:40:56.645932734 +0100
15	+++ phpki-ng/phpki-ng-0.84/setup.php-presetup 2021-03-08 18:52:22.704152770 +0100
16	@@ -692,7 +692,7 @@
17	#
18	# Create a new self-signed CA certificate in PEM format.
19	#
20	- print '<strong>Creating root certificate...</strong><br>';
21	+ print '<strong>Creating root certificate... '. $keysize .' bits</strong><br>';
22	flush();
23
24	$configOpenssl_cnf = $config['openssl_cnf'];
25	@@ -773,7 +773,7 @@
26	} else {
27	echo "openvpn is required to generate a takey.pem<br>";
28	echo "You can create one later like this:<br>";
29	- echo "openvpn --genkey --secret". $configPrivate_dir . "/takey.pem<br>";
30	+ echo "openvpn --genkey --secret ". $configPrivate_dir . "/takey.pem<br>";
31	}
32
33
34	@@ -949,7 +949,10 @@
35	<tr>
36	<th colspan=2><h3>Root Certificate Data</h3></th>
37	</tr>
38	-
39	+ <tr>
40	+ <td/><h4><font color=red>* Required field</font></h4></td>
41	+ <td> </td>
42	+ </tr>
43	<tr>
44	<td width=35%><strong>Organization</strong> <font color=red>*</font></td>
45	<td><input type=text name=organization value="<?php echo htvar($organization)?>" maxlength=60 size=50></td>
46	@@ -1218,12 +1221,20 @@
47	</td>
48	</tr>
49	</table>
50	- <font color=red>* Required field</font>
51
52	+ <font color=red>* Required field</font>
53	+ <p><center><font color=red>Please click the Submit button ONCE and be patient.</font><br />
54	+ This may take a few minutes. Please do not interrupt the process.....</center>
55	+ </p>
56	+
57	+ <p><center><font color=red>Please click the Submit button ONCE and be patient.</font><br />
58	+ This may take a few minutes. Please do not interrupt the process.....</center>
59	+ </p>
60	<p>
61	- <center><input type=submit name=submit value=Submit></center></td>
62	+ <center><input style="border: 1px solid red; padding: 10px;" type=submit name=submit value=Submit></center>
63	<input type=hidden name=stage value='validate'>
64	</form>
65	+ </p>
66
67	<?php
68	printFooter();