lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

certs: rename constants for revocation reasons

Browse Source 
Discussed with @swhite2 conceptually before and upon further
inspection we do not rely on the correct naming as long as the
number mapping remains correct.

This makes debug mode work on PHP 7.4 as well.  PHP 8 is unaffected.
This commit is contained in:
Franco Fichtner 2022-06-10 08:43:40 +02:00
parent 49ccb4ee56
commit 03fb3d71cd
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/etc/inc/certs.inc
View File

@ -34,27 +34,27 @@ require_once('phpseclib/File/ASN1/Element.php');
require_once('phpseclib/Crypt/RSA.php');
require_once('phpseclib/Crypt/Hash.php');
define("OCSP_REVOKED_STATUS_NOSTATUS", -1);
define("OCSP_REVOKED_STATUS_UNSPECIFIED", 0);
define("OCSP_REVOKED_STATUS_KEYCOMPROMISE", 1);
define("OCSP_REVOKED_STATUS_CACOMPROMISE", 2);
define("OCSP_REVOKED_STATUS_AFFILIATIONCHANGED", 3);
define("OCSP_REVOKED_STATUS_SUPERSEDED", 4);
define("OCSP_REVOKED_STATUS_CESSATIONOFOPERATION", 5);
define("OCSP_REVOKED_STATUS_CERTIFICATEHOLD", 6);
define("CERT_CRL_STATUS_NOSTATUS", -1);
define("CERT_CRL_STATUS_UNSPECIFIED", 0);
define("CERT_CRL_STATUS_KEYCOMPROMISE", 1);
define("CERT_CRL_STATUS_CACOMPROMISE", 2);
define("CERT_CRL_STATUS_AFFILIATIONCHANGED", 3);
define("CERT_CRL_STATUS_SUPERSEDED", 4);
define("CERT_CRL_STATUS_CESSATIONOFOPERATION", 5);
define("CERT_CRL_STATUS_CERTIFICATEHOLD", 6);
function crl_status_code()
{
/* Array index 0 is a description, index 1 is the key used by phpseclib */
return array(
OCSP_REVOKED_STATUS_NOSTATUS => ["No Status (default)", "unused"],
OCSP_REVOKED_STATUS_UNSPECIFIED => ["Unspecified", "unused"],
OCSP_REVOKED_STATUS_KEYCOMPROMISE => ["Key Compromise", "keyCompromise"],
OCSP_REVOKED_STATUS_CACOMPROMISE => ["CA Compromise", "cACompromise"],
OCSP_REVOKED_STATUS_AFFILIATIONCHANGED => ["Affiliation Changed", "affiliationChanged"],
OCSP_REVOKED_STATUS_SUPERSEDED => ["Superseded", "superseded"],
OCSP_REVOKED_STATUS_CESSATIONOFOPERATION => ["Cessation of Operation", "cessationOfOperation"],
OCSP_REVOKED_STATUS_CERTIFICATEHOLD => ["Certificate Hold", "certificateHold"]
CERT_CRL_STATUS_NOSTATUS => ["No Status (default)", "unused"],
CERT_CRL_STATUS_UNSPECIFIED => ["Unspecified", "unused"],
CERT_CRL_STATUS_KEYCOMPROMISE => ["Key Compromise", "keyCompromise"],
CERT_CRL_STATUS_CACOMPROMISE => ["CA Compromise", "cACompromise"],
CERT_CRL_STATUS_AFFILIATIONCHANGED => ["Affiliation Changed", "affiliationChanged"],
CERT_CRL_STATUS_SUPERSEDED => ["Superseded", "superseded"],
CERT_CRL_STATUS_CESSATIONOFOPERATION => ["Cessation of Operation", "cessationOfOperation"],
CERT_CRL_STATUS_CERTIFICATEHOLD => ["Certificate Hold", "certificateHold"]
);
}
@ -663,7 +663,7 @@ function crl_update(&$crl)
return true;
}
function cert_revoke($cert, &$crl, $reason = OCSP_REVOKED_STATUS_UNSPECIFIED)
function cert_revoke($cert, &$crl, $reason = CERT_CRL_STATUS_UNSPECIFIED)
{
if (is_cert_revoked($cert, $crl['refid'])) {
return true;

2
src/www/system_crlmanager.php
View File

@ -168,7 +168,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
if (!count($input_errors)) {
$reason = (empty($pconfig['crlreason'])) ? OCSP_REVOKED_STATUS_UNSPECIFIED : $pconfig['crlreason'];
$reason = (empty($pconfig['crlreason'])) ? CERT_CRL_STATUS_UNSPECIFIED : $pconfig['crlreason'];
cert_revoke($cert, $crl, $reason);
plugins_configure('crl');
write_config(sprintf('Revoked certificate %s in CRL %s', $cert['descr'], $crl['descr']));