diff -Nur -x '*.orig' -x '*.rej' phpki/phpki-0.82/ca/main.php mezzanine_patched_phpki/phpki-0.82/ca/main.php
--- phpki/phpki-0.82/ca/main.php 2008-12-09 09:10:50.000000000 +0100
+++ mezzanine_patched_phpki/phpki-0.82/ca/main.php 2008-12-09 09:09:47.000000000 +0100
@@ -88,6 +88,18 @@
print '
'.dhparam_text().'
';
break;
+case 'display_root_pem':
+ printHeader(false);
+
+ ?>
+ Root certificate file (PEM Encoded)
+
+
+
+ print ''.root_pem_text().'
';
+ break;
default:
@@ -117,7 +129,8 @@
Read the online help to learn more about this.
- ?stage=dl_root>Download the Root Certificate |
+ ?stage=dl_root>Download the Root Certificate
+ ?stage=display_root_pem>Display the Root Certificate (PEM Encoded)
The "Root" certificate must be installed before using any of the
certificates issued here. Read the online help
to learn more about this. |
diff -Nur -x '*.orig' -x '*.rej' phpki/phpki-0.82/include/openssl_functions.php mezzanine_patched_phpki/phpki-0.82/include/openssl_functions.php
--- phpki/phpki-0.82/include/openssl_functions.php 2008-12-09 09:10:50.000000000 +0100
+++ mezzanine_patched_phpki/phpki-0.82/include/openssl_functions.php 2008-12-09 09:10:28.000000000 +0100
@@ -428,7 +428,11 @@
return(shell_exec('cat '.escshellarg($config['private_dir']).'/dhparam1024.pem 2>&1'));
}
-
+// Returns the root CA certificate file (PEM Encoded)
+function root_pem_text() {
+ global $config;
+ return(shell_exec('cat '.escshellarg($config['cacert_pem']).' 2>&1'));
+}
//
// Returns the subject of a certificate.