Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 1110 → Rev 1111

/trunk/vendor/composer/installed.json
288,18 → 288,18
"source": {
"type": "git",
"url": "https://github.com/danielmarschall/php_utils.git",
"reference": "11ea6163db866fcda8bc0a4275626739a1a0d50d"
"reference": "8dd83ee571da1002bc606b27d9e4ba0e3a1e54c5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/danielmarschall/php_utils/zipball/11ea6163db866fcda8bc0a4275626739a1a0d50d",
"reference": "11ea6163db866fcda8bc0a4275626739a1a0d50d",
"url": "https://api.github.com/repos/danielmarschall/php_utils/zipball/8dd83ee571da1002bc606b27d9e4ba0e3a1e54c5",
"reference": "8dd83ee571da1002bc606b27d9e4ba0e3a1e54c5",
"shasum": ""
},
"require": {
"php": ">=7.0"
},
"time": "2023-02-28T22:48:27+00:00",
"time": "2023-03-03T11:19:41+00:00",
"default-branch": true,
"type": "library",
"installation-source": "dist",
774,12 → 774,12
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "3b6030d8875a93b9e7d1592e270436fc4ea91295"
"reference": "6298d1cd55c3ffa44533bd41906caec246b60440"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/3b6030d8875a93b9e7d1592e270436fc4ea91295",
"reference": "3b6030d8875a93b9e7d1592e270436fc4ea91295",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/6298d1cd55c3ffa44533bd41906caec246b60440",
"reference": "6298d1cd55c3ffa44533bd41906caec246b60440",
"shasum": ""
},
"require": {
797,7 → 797,7
"ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
"ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
},
"time": "2023-02-12T04:28:10+00:00",
"time": "2023-03-02T09:25:08+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
/trunk/vendor/composer/installed.php
73,7 → 73,7
'danielmarschall/php_utils' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '11ea6163db866fcda8bc0a4275626739a1a0d50d',
'reference' => '8dd83ee571da1002bc606b27d9e4ba0e3a1e54c5',
'type' => 'library',
'install_path' => __DIR__ . '/../danielmarschall/php_utils',
'aliases' => array(
178,7 → 178,7
'phpseclib/phpseclib' => array(
'pretty_version' => '3.0.x-dev',
'version' => '3.0.9999999.9999999-dev',
'reference' => '3b6030d8875a93b9e7d1592e270436fc4ea91295',
'reference' => '6298d1cd55c3ffa44533bd41906caec246b60440',
'type' => 'library',
'install_path' => __DIR__ . '/../phpseclib/phpseclib',
'aliases' => array(),
/trunk/vendor/danielmarschall/php_utils/vts_crypt.inc.php
478,7 → 478,7
 
function hash_ex($algo, $data, $binary=false, $options=array()) {
if (!hash_supported_natively($algo) && str_starts_with($algo, 'sha3-') && method_exists('\bb\Sha3\Sha3', 'hash')) {
$bits = explode('-',$algo)[1];
$bits = (int)explode('-',$algo)[1];
$hash = \bb\Sha3\Sha3::hash($data, $bits, $binary);
} else {
$hash = hash($algo, $data, $binary);
488,7 → 488,7
 
function hash_hmac_ex($algo, $data, $key, $binary=false) {
if (!hash_hmac_supported_natively($algo) && str_starts_with($algo, 'sha3-') && method_exists('\bb\Sha3\Sha3', 'hash_hmac')) {
$bits = explode('-',$algo)[1];
$bits = (int)explode('-',$algo)[1];
$hash = \bb\Sha3\Sha3::hash_hmac($data, $key, $bits, $binary);
} else {
$hash = hash_hmac($algo, $data, $key, $binary);
501,7 → 501,7
if ($iterations == 0/*default*/) {
$iterations = _vts_password_default_iterations($algo, true);
}
$bits = explode('-',$algo)[1];
$bits = (int)explode('-',$algo)[1];
$hash = \bb\Sha3\Sha3::hash_pbkdf2($password, $salt, $iterations, $bits, $length, $binary);
} else {
if ($iterations == 0/*default*/) {
/trunk/vendor/licenses
12,8 → 12,8
danielmarschall/oidconverter dev-master 75088eb Apache-2.0
danielmarschall/php-sha3 9999999-dev 5605bd5 MIT
danielmarschall/php-sha3 dev-master 5605bd5 MIT
danielmarschall/php_utils 9999999-dev 11ea616 Apache-2.0
danielmarschall/php_utils dev-master 11ea616 Apache-2.0
danielmarschall/php_utils 9999999-dev 8dd83ee Apache-2.0
danielmarschall/php_utils dev-master 8dd83ee Apache-2.0
danielmarschall/uuid_mac_utils 9999999-dev d0edce1 Apache-2.0
danielmarschall/uuid_mac_utils dev-master d0edce1 Apache-2.0
danielmarschall/vnag 9999999-dev 839d7dd Apache-2.0
26,7 → 26,7
matthiasmullie/path-converter 1.1.3 MIT
paragonie/constant_time_encoding v2.6.3 MIT
paragonie/random_compat v9.99.100 MIT
phpseclib/phpseclib 3.0.x-dev 3b6030d MIT
phpseclib/phpseclib 3.0.x-dev 6298d1c MIT
script47/bs5-utils master master MIT
spamspan/spamspan master GPL-2.0-only
symfony/polyfill-mbstring v1.19.0 MIT
/trunk/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField/Integer.php
263,13 → 263,13
$r = $this->value->powMod($temp, static::$modulo[$this->instanceID]);
 
while (!$t->equals($one)) {
$i = clone $one;
 
while (!$t->powMod($two->pow($i), static::$modulo[$this->instanceID])->equals($one)) {
$i = $i->add($one);
for ($i == clone $one; $i->compare($m) < 0; $i = $i->add($one)) {
if ($t->powMod($two->pow($i), static::$modulo[$this->instanceID])->equals($one)) {
break;
}
}
 
if ($i->compare($m) >= 0) {
if ($i->compare($m) == 0) {
return false;
}
$b = $c->powMod($two->pow($m->subtract($i)->subtract($one)), static::$modulo[$this->instanceID]);
/trunk/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField.php
44,9 → 44,9
*/
public function __construct(BigInteger $modulo)
{
//if (!$modulo->isPrime()) {
// throw new \UnexpectedValueException('PrimeField requires a prime number be passed to the constructor');
//}
if (!$modulo->isPrime()) {
throw new \UnexpectedValueException('PrimeField requires a prime number be passed to the constructor');
}
 
$this->instanceID = self::$instanceCounter++;
Integer::setModulo($this->instanceID, $modulo);