Move variable declaration to the top, declare it global before defining. Fixes #3090

This commit is contained in:
jim-p 2013-07-11 15:16:26 -04:00
parent a5a2fc68d7
commit e09b941d28

View File

@ -34,8 +34,21 @@ define("OPEN_SSL_CONF_PATH", "/etc/ssl/openssl.cnf");
require_once("functions.inc");
global $openssl_digest_algs;
$openssl_digest_algs = array("sha1", "sha224", "sha256", "sha384", "sha512");
global $openssl_crl_status;
$openssl_crl_status = array(
OCSP_REVOKED_STATUS_NOSTATUS => "No Status (default)",
OCSP_REVOKED_STATUS_UNSPECIFIED => "Unspecified",
OCSP_REVOKED_STATUS_KEYCOMPROMISE => "Key Compromise",
OCSP_REVOKED_STATUS_CACOMPROMISE => "CA Compromise",
OCSP_REVOKED_STATUS_AFFILIATIONCHANGED => "Affiliation Changed",
OCSP_REVOKED_STATUS_SUPERSEDED => "Superseded",
OCSP_REVOKED_STATUS_CESSATIONOFOPERATION => "Cessation of Operation",
OCSP_REVOKED_STATUS_CERTIFICATEHOLD => "Certificate Hold"
);
function & lookup_ca($refid) {
global $config;
@ -561,17 +574,6 @@ function cert_in_use($certref) {
is_captiveportal_cert($certref));
}
$openssl_crl_status = array(
OCSP_REVOKED_STATUS_NOSTATUS => "No Status (default)",
OCSP_REVOKED_STATUS_UNSPECIFIED => "Unspecified",
OCSP_REVOKED_STATUS_KEYCOMPROMISE => "Key Compromise",
OCSP_REVOKED_STATUS_CACOMPROMISE => "CA Compromise",
OCSP_REVOKED_STATUS_AFFILIATIONCHANGED => "Affiliation Changed",
OCSP_REVOKED_STATUS_SUPERSEDED => "Superseded",
OCSP_REVOKED_STATUS_CESSATIONOFOPERATION => "Cessation of Operation",
OCSP_REVOKED_STATUS_CERTIFICATEHOLD => "Certificate Hold"
);
function crl_create(& $crl, $caref, $name, $serial=0, $lifetime=9999) {
global $config;
$ca =& lookup_ca($caref);