Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace rand() & mt_rand() by random_int() #504

Merged
merged 2 commits into from
Nov 28, 2023
Merged

replace rand() & mt_rand() by random_int() #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6179781
replace rand() & mt_rand() by random_int()
tenzap Sep 24, 2023
181465c
replace mt_srand() by \Random\Engine\Mt19937 calls for php >= 8.2
tenzap Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions application/models/gateway/Gammu_model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function send_messages($data)

// generate UDH
$UDH = '050003';
$hex = dechex(mt_rand(0, 255));
$hex = dechex(random_int(0, 255));
$hex = str_pad($hex, 2, '0', STR_PAD_LEFT);
$UDH .= strtoupper($hex);
$data['UDH'] = $UDH;
Expand Down Expand Up @@ -1455,7 +1455,7 @@ function copy_message($msg_id)
$newUDH = '';
for ($j = 1; $j <= 4; $j++)
{
$newUDH .= strtoupper(dechex(mt_rand(0, 255)));
$newUDH .= strtoupper(dechex(random_int(0, 255)));
}
$data->UDH = $newUDH.substr($data->UDH, -4);
}
Expand Down
2 changes: 1 addition & 1 deletion application/models/gateway/Way2sms_model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function sendWay2SMS($uid, $pwd, $phone, $msg)
$uid = urlencode($uid);
$pwd = urlencode($pwd);

$autobalancer = rand(1, 8);
$autobalancer = random_int(1, 8);

curl_setopt($curl, CURLOPT_URL, 'http://site'.$autobalancer.'.way2sms.com/Login1.action');
curl_setopt($curl, CURLOPT_POST, 1);
Expand Down
2 changes: 1 addition & 1 deletion application/plugins/sms_to_twitter/libraries/Epi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ protected function generateNonce()
if(isset($this->nonce)) // for unit testing
return $this->nonce;

return md5(uniqid(rand(), true));
return md5(uniqid(random_int(0, PHP_INT_MAX), true));
}

// parameters should already have been passed through prepareParameters
Expand Down
29 changes: 27 additions & 2 deletions application/plugins/sms_to_xmpp/libraries/abhinavsingh-JAXL-5829c3b/core/jaxl.util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,31 @@
* @link http://code.google.com/p/jaxl
*/

// Based on: https://3v4l.org/B18he from https://wiki.php.net/rfc/deprecations_php_8_3
function my_mt_srand($seed = null) {
if (version_compare(PHP_VERSION, '8.2.0') >= 0) {
$GLOBALS['my_mt_rand'] = new \Random\Randomizer(new \Random\Engine\Mt19937($seed));
} else {
mt_srand($seed);
}
}

function my_mt_rand($min = null, $max = null) {
if (version_compare(PHP_VERSION, '8.2.0') >= 0) {
if (!isset($GLOBALS['my_mt_rand'])) {
$GLOBALS['my_mt_rand'] = new \Random\Randomizer(new \Random\Engine\Mt19937());
}

if ($min === null && $max === null) {
return $GLOBALS['my_mt_rand']->nextInt();
}

return $GLOBALS['my_mt_rand']->getInt($min, $max);
} else {
return mt_rand($min, $max);
}
}

/**
* Jaxl Utility Class
*/
Expand Down Expand Up @@ -128,9 +153,9 @@ public static function implodeData($data) {

public static function generateNonce() {
$str = '';
mt_srand((double) microtime()*10000000);
my_mt_srand((double) microtime()*10000000);
for($i=0; $i<32; $i++)
$str .= chr(mt_rand(0, 255));
$str .= chr(my_mt_rand(0, 255));
return $str;
}

Expand Down
2 changes: 1 addition & 1 deletion application/plugins/sms_to_xmpp/libraries/abhinavsingh-JAXL-5829c3b/xep/jaxl.0124.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public static function out($payload) {
}

public static function loadSession($jaxl) {
$jaxl->bosh['rid'] = isset($_SESSION['jaxl_rid']) ? (string) $_SESSION['jaxl_rid'] : rand(1000, 10000);
$jaxl->bosh['rid'] = isset($_SESSION['jaxl_rid']) ? (string) $_SESSION['jaxl_rid'] : random_int(1000, 10000);
$jaxl->bosh['sid'] = isset($_SESSION['jaxl_sid']) ? (string) $_SESSION['jaxl_sid'] : false;
$jaxl->lastid = isset($_SESSION['jaxl_id']) ? $_SESSION['jaxl_id'] : $jaxl->lastid;
$jaxl->jid = isset($_SESSION['jaxl_jid']) ? $_SESSION['jaxl_jid'] : $jaxl->jid;
Expand Down
2 changes: 1 addition & 1 deletion application/plugins/sms_to_xmpp/libraries/abhinavsingh-JAXL-5829c3b/xmpp/xmpp.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ function __construct($config) {
$this->clocked = $this->startTime = time();

/* Parse configuration parameter */
$this->lastid = rand(1, 9);
$this->lastid = random_int(1, 9);
$this->streamTimeout = isset($config['streamTimeout']) ? $config['streamTimeout'] : 20;
$this->rateLimit = isset($config['rateLimit']) ? $config['rateLimit'] : true;
$this->getPktSize = isset($config['getPktSize']) ? $config['getPktSize'] : 4096;
Expand Down