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

Revert changes which I am not sure about. Add fix from https://github.com/radicand/phpki/issues/14

Browse Source
This commit is contained in:
John Crisp
2020-02-27 18:12:18 +01:00
parent d3d8e7ffa9
commit 1f8734783f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/openssl_functions.php
View File

@@ -750,9 +750,9 @@ function CA_renew_cert($old_serial,$expiry,$passwd) {
} }
else { else {
$cmd_output[] = "infile: $usercert keyfile: $userkey outfile: $userpfx"; $cmd_output[] = "infile: $usercert keyfile: $userkey outfile: $userpfx";
exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name -passout pass: 2>&1", $cmd_output, $ret); # reetp - this needs looking at
# reetp #exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name -passout pass: 2>&1", $cmd_output, $ret);
# exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name -nodes 2>&1", $cmd_output, $ret); exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name -nodes 2>&1", $cmd_output, $ret);
} }
}; };
@@ -760,6 +760,14 @@ function CA_renew_cert($old_serial,$expiry,$passwd) {
#Unlock the CA database #Unlock the CA database
fclose($fd); fclose($fd);
# https://github.com/radicand/phpki/issues/14
if (ereg('E-mail Protection', $certtext) && ereg('Code Signing', $certtest)) {
$cert_type = 'email_signing';
}
if (ereg('E-mail Protection', $certtext)) {
$cert_type = 'email';
}
#Remove temporary openssl config file. #Remove temporary openssl config file.
if (file_exists($cnf_file)) unlink($cnf_file); if (file_exists($cnf_file)) unlink($cnf_file);