Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 1260 → Rev 1261

/trunk/vendor/composer/installed.json
392,18 → 392,18
"source": {
"type": "git",
"url": "https://github.com/danielmarschall/uuid_mac_utils.git",
"reference": "53cddf0c0fed11478dc2b0c526b172358b34f128"
"reference": "5276a39b98752a800abc7b9c16b9d0c9928f934f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/danielmarschall/uuid_mac_utils/zipball/53cddf0c0fed11478dc2b0c526b172358b34f128",
"reference": "53cddf0c0fed11478dc2b0c526b172358b34f128",
"url": "https://api.github.com/repos/danielmarschall/uuid_mac_utils/zipball/5276a39b98752a800abc7b9c16b9d0c9928f934f",
"reference": "5276a39b98752a800abc7b9c16b9d0c9928f934f",
"shasum": ""
},
"require": {
"php": ">=7.0"
},
"time": "2023-05-01T14:57:37+00:00",
"time": "2023-05-06T20:34:16+00:00",
"default-branch": true,
"type": "library",
"installation-source": "dist",
433,18 → 433,18
"source": {
"type": "git",
"url": "https://github.com/danielmarschall/vnag.git",
"reference": "839d7ddfe183bf59ab1a2a37e0c24e7653340ccb"
"reference": "4187cbaf037c95e81cefbef119ee1ab35908abe2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/danielmarschall/vnag/zipball/839d7ddfe183bf59ab1a2a37e0c24e7653340ccb",
"reference": "839d7ddfe183bf59ab1a2a37e0c24e7653340ccb",
"url": "https://api.github.com/repos/danielmarschall/vnag/zipball/4187cbaf037c95e81cefbef119ee1ab35908abe2",
"reference": "4187cbaf037c95e81cefbef119ee1ab35908abe2",
"shasum": ""
},
"require": {
"php": ">=7.0"
},
"time": "2022-12-18T19:54:16+00:00",
"time": "2023-05-02T23:40:04+00:00",
"default-branch": true,
"type": "library",
"installation-source": "dist",
837,12 → 837,12
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "79b6f96870fcce07907e6b411a2c690496b5eb4c"
"reference": "961034f4c2e3ade2ae2e7b60d0d78d5176866222"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/79b6f96870fcce07907e6b411a2c690496b5eb4c",
"reference": "79b6f96870fcce07907e6b411a2c690496b5eb4c",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/961034f4c2e3ade2ae2e7b60d0d78d5176866222",
"reference": "961034f4c2e3ade2ae2e7b60d0d78d5176866222",
"shasum": ""
},
"require": {
860,7 → 860,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-04-21T20:39:01+00:00",
"time": "2023-05-05T12:36:29+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
/trunk/vendor/composer/installed.php
95,7 → 95,7
'danielmarschall/uuid_mac_utils' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '53cddf0c0fed11478dc2b0c526b172358b34f128',
'reference' => '5276a39b98752a800abc7b9c16b9d0c9928f934f',
'type' => 'library',
'install_path' => __DIR__ . '/../danielmarschall/uuid_mac_utils',
'aliases' => array(
106,7 → 106,7
'danielmarschall/vnag' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '839d7ddfe183bf59ab1a2a37e0c24e7653340ccb',
'reference' => '4187cbaf037c95e81cefbef119ee1ab35908abe2',
'type' => 'library',
'install_path' => __DIR__ . '/../danielmarschall/vnag',
'aliases' => array(
189,7 → 189,7
'phpseclib/phpseclib' => array(
'pretty_version' => '3.0.x-dev',
'version' => '3.0.9999999.9999999-dev',
'reference' => '79b6f96870fcce07907e6b411a2c690496b5eb4c',
'reference' => '961034f4c2e3ade2ae2e7b60d0d78d5176866222',
'type' => 'library',
'install_path' => __DIR__ . '/../phpseclib/phpseclib',
'aliases' => array(),
/trunk/vendor/danielmarschall/uuid_mac_utils/includes/uuid_utils.inc.php
3,7 → 3,7
/*
* UUID utils for PHP
* Copyright 2011 - 2023 Daniel Marschall, ViaThinkSoft
* Version 2023-04-29
* Version 2023-05-06
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
28,6 → 28,15
define('UUID_NAMEBASED_NS_OID', '6ba7b812-9dad-11d1-80b4-00c04fd430c8');
define('UUID_NAMEBASED_NS_X500_DN', '6ba7b814-9dad-11d1-80b4-00c04fd430c8');
 
function _random_int($min, $max) {
// This function tries a CSRNG and falls back to a RNG if no CSRNG is available
try {
return random_int($min, $max);
} catch (Exception $e) {
return mt_rand($min, $max);
}
}
 
function uuid_valid($uuid) {
$uuid = str_replace(array('-', '{', '}'), '', $uuid);
$uuid = strtoupper($uuid);
408,8 → 417,8
* We don't support saved state information and generate
* a random clock sequence each time.
*/
$uuid['clock_seq_hi'] = 0x80 | mt_rand(0, 64);
$uuid['clock_seq_low'] = mt_rand(0, 255);
$uuid['clock_seq_hi'] = 0x80 | _random_int(0, 64);
$uuid['clock_seq_low'] = _random_int(0, 255);
 
/*
* Node should be set to the 48-bit IEEE node identifier
590,11 → 599,11
# Make the UUID by ourselves
# Source: http://rogerstringer.com/2013/11/15/generate-uuids-php
return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
mt_rand( 0, 0xffff ),
mt_rand( 0, 0x0fff ) | 0x4000,
mt_rand( 0, 0x3fff ) | 0x8000,
mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
_random_int( 0, 0xffff ), _random_int( 0, 0xffff ),
_random_int( 0, 0xffff ),
_random_int( 0, 0x0fff ) | 0x4000,
_random_int( 0, 0x3fff ) | 0x8000,
_random_int( 0, 0xffff ), _random_int( 0, 0xffff ), _random_int( 0, 0xffff )
);
}
 
/trunk/vendor/licenses
16,10 → 16,10
danielmarschall/php-sha3 dev-master 5605bd5 MIT
danielmarschall/php_utils 9999999-dev 4a41123 Apache-2.0
danielmarschall/php_utils dev-master 4a41123 Apache-2.0
danielmarschall/uuid_mac_utils 9999999-dev 53cddf0 Apache-2.0
danielmarschall/uuid_mac_utils dev-master 53cddf0 Apache-2.0
danielmarschall/vnag 9999999-dev 839d7dd Apache-2.0
danielmarschall/vnag dev-master 839d7dd Apache-2.0
danielmarschall/uuid_mac_utils 9999999-dev 5276a39 Apache-2.0
danielmarschall/uuid_mac_utils dev-master 5276a39 Apache-2.0
danielmarschall/vnag 9999999-dev 4187cba Apache-2.0
danielmarschall/vnag dev-master 4187cba Apache-2.0
dcodeio/bcrypt.js master master BSD-3-Clause, MIT
emn178/js-sha3 master master MIT
firebase/php-jwt v5.5.1 BSD-3-Clause
28,7 → 28,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 79b6f96 MIT
phpseclib/phpseclib 3.0.x-dev 961034f 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/Crypt/Common/SymmetricKey.php
917,7 → 917,7
* @see Crypt/Hash.php
* @param string $password
* @param string $method
* @param string[] ...$func_args
* @param int|string ...$func_args
* @throws \LengthException if pbkdf1 is being used and the derived key length exceeds the hash length
* @throws \RuntimeException if bcrypt is being used and a salt isn't provided
* @return bool