Security: fix warning in hash generation -refs BT#21323

NicoDucou · NicoDucou · commit 8b49c4f2c470 · 2024-01-29T08:39:47.000+01:00
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
@@ -10633,7 +10633,6 @@ function api_decrypt_ldap_password(string $encryptedText): string
  */
 function api_decrypt_hash(string $encryptedHash, string $secret): string
 {
-    $secret = hex2bin($secret);
     $iv = base64_decode(substr($encryptedHash, 0, 16), true);
     $data = base64_decode(substr($encryptedHash, 16), true);
     $tag = substr($data, strlen($data) - 16);
@@ -10663,7 +10662,6 @@ function api_decrypt_hash(string $encryptedHash, string $secret): string
  */
 function api_encrypt_hash($data, $secret)
 {
-  $secret = hex2bin($secret);
   $iv = random_bytes(12);
   $tag = '';
 

Original file line number	Diff line number	Diff line change
`@@ -10633,7 +10633,6 @@ function api_decrypt_ldap_password(string $encryptedText): string`
`10633`	`10633`	`*/`
`10634`	`10634`	`function api_decrypt_hash(string $encryptedHash, string $secret): string`
`10635`	`10635`	`{`
`10636`		`- $secret = hex2bin($secret);`
`10637`	`10636`	`$iv = base64_decode(substr($encryptedHash, 0, 16), true);`
`10638`	`10637`	`$data = base64_decode(substr($encryptedHash, 16), true);`
`10639`	`10638`	`$tag = substr($data, strlen($data) - 16);`
`@@ -10663,7 +10662,6 @@ function api_decrypt_hash(string $encryptedHash, string $secret): string`
`10663`	`10662`	`*/`
`10664`	`10663`	`function api_encrypt_hash($data, $secret)`
`10665`	`10664`	`{`
`10666`		`- $secret = hex2bin($secret);`
`10667`	`10665`	`$iv = random_bytes(12);`
`10668`	`10666`	`$tag = '';`
`10669`	`10667`