From 217421b1cf34c2160aef64db8e6e40ab0104783f Mon Sep 17 00:00:00 2001 From: adolfintel Date: Thu, 14 Feb 2019 09:02:47 +0100 Subject: [PATCH] Merged with master --- Frontend/telemetry/idObfuscation.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Frontend/telemetry/idObfuscation.php b/Frontend/telemetry/idObfuscation.php index eb28b19..2b5b59b 100644 --- a/Frontend/telemetry/idObfuscation.php +++ b/Frontend/telemetry/idObfuscation.php @@ -23,16 +23,18 @@ function obfdeobf($id){ $id=$id&0xFFFFFFFF; for($i=0;$i<16;$i++){ $id=$id^$salt; + $salt=(($salt>>1)&0xFFFFFFFF)|(($salt&0x00000001)<<31); + $id=((0x0000FFFF&$id)<<16)|((0xFFFF0000&$id)>>16); $id=(($id>>1)&0xFFFFFFFF)|(($id&0x00000001)<<31); - $salt=(($salt<<1)&0xFFFFFFFF)|(($salt&0xA0000000)>>31); } return $id; } function obfuscateId($id){ - return base_convert(obfdeobf($id),10,36); + return str_pad(base_convert(obfdeobf($id+1),10,36),7,0,STR_PAD_LEFT); } function deobfuscateId($id){ - return obfdeobf(base_convert($id,36,10)); + return obfdeobf(base_convert($id,36,10))-1; } + //IMPORTANT: DO NOT ADD ANYTHING BELOW THE PHP CLOSING TAG, NOT EVEN EMPTY LINES! ?> \ No newline at end of file