1
0
mirror of https://github.com/danog/phpseclib.git synced 2025-01-22 13:01:59 +01:00

Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2021-12-26 02:23:57 -06:00
commit c60b0c3cc7
2 changed files with 2 additions and 2 deletions

View File

@ -470,7 +470,7 @@ class RSA
case defined('MATH_BIGINTEGER_OPENSSL_DISABLE'): case defined('MATH_BIGINTEGER_OPENSSL_DISABLE'):
define('CRYPT_RSA_MODE', self::MODE_INTERNAL); define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
break; break;
case extension_loaded('openssl') && file_exists($this->configFile): case function_exists('phpinfo') && extension_loaded('openssl') && file_exists($this->configFile):
// some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work // some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
$versions = array(); $versions = array();

View File

@ -263,7 +263,7 @@ class BigInteger
} }
} }
if (extension_loaded('openssl') && !defined('MATH_BIGINTEGER_OPENSSL_DISABLE') && !defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) { if (function_exists('phpinfo') && extension_loaded('openssl') && !defined('MATH_BIGINTEGER_OPENSSL_DISABLE') && !defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
// some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work // some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
$versions = array(); $versions = array();