fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Move PKI scripts to pki directory

Browse source
This commit is contained in:
nemunaire 2015-01-13 17:04:35 +01:00 • committed by Nemunaire
commit de48af8ef8
3 changed files with 23 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

25
onyx/include/admin/certificate.php
View file

@ -25,16 +25,14 @@ function remove_directory($dir)
function new_client($name, $misc_dir)
{
//TODO handle if already exist
putenv("OPENSSL_CONF=$misc_dir/openssl.cnf");
putenv("PKI_DIR=$misc_dir/pki");
return shell_exec("$misc_dir/CA.sh -newclient $name");
putenv("PKI_BASEDIR=$misc_dir");
return shell_exec("$misc_dir/../pki/CA.sh -newclient $name");
}
function revoke_client($name, $misc_dir)
{
putenv("OPENSSL_CONF=$misc_dir/openssl.cnf");
putenv("PKI_DIR=$misc_dir/pki");
return shell_exec("$misc_dir/CA.sh -revoke $name");
putenv("PKI_BASEDIR=$misc_dir");
return shell_exec("$misc_dir/../pki/CA.sh -revoke $name");
}
if (!empty($p[2]))
@ -49,10 +47,9 @@ if (!empty($p[2]))
if ($p[2] == "newca")
{
putenv("OPENSSL_CONF=$misc_dir/openssl.cnf");
putenv("PKI_DIR=$misc_dir/pki");
putenv("PKI_BASEDIR=$misc_dir");
$template->assign("output",
shell_exec("$misc_dir/CA.sh -newca"));
shell_exec("$misc_dir/../pki/CA.sh -newca"));
return "admin/shell";
}
@ -64,19 +61,17 @@ if (!empty($p[2]))
elseif ($p[2] == "newsrv")
{
putenv("OPENSSL_CONF=$misc_dir/openssl.cnf");
putenv("PKI_DIR=$misc_dir/pki");
putenv("PKI_BASEDIR=$misc_dir");
$template->assign("output",
shell_exec("$misc_dir/CA.sh -newserver"));
shell_exec("$misc_dir/../pki/CA.sh -newserver"));
return "admin/shell";
}
elseif ($p[2] == "revokesrv")
{
putenv("OPENSSL_CONF=$misc_dir/openssl.cnf");
putenv("PKI_DIR=$misc_dir/pki");
putenv("PKI_BASEDIR=$misc_dir");
$template->assign("output",
shell_exec("$misc_dir/CA.sh -revokeserver"));
shell_exec("$misc_dir/../pki/CA.sh -revokeserver"));
return "admin/shell";
}