nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-10-11 05:56:15 +08:00
Code Issues Projects Releases Packages Wiki Activity

refactor hash_equals usage in the EncryptService decrypt method

Browse source 
Signed-off-by: binsky <timo@binsky.org>
This commit is contained in:
binsky 2022-05-04 01:41:18 +02:00
parent ccb884f5ac
commit f48fd19979
1 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/Service/EncryptService.php
View file

@ -152,14 +152,14 @@ class EncryptService {
list ($cipherKey, $macKey, $iv) = $this->getKeys($salt, $key);
if (!$this->hash_equals(hash_hmac('sha512', $enc, $macKey, true), $mac)) {
return false;
if (hash_equals(hash_hmac('sha512', $enc, $macKey, true), $mac)) {
$dec = openssl_decrypt($enc, $this->cipher, $cipherKey, true, $iv);
$data = $this->unpad($dec);
return $data;
}
$dec = openssl_decrypt($enc, $this->cipher, $cipherKey, true, $iv);
$data = $this->unpad($dec);
return $data;
return false;
}
/**
@ -206,26 +206,6 @@ class EncryptService {
return array($cipherKey, $macKey, $iv);
}
/**
* Use Double HMAC Comparison with a random key to truly blind the comparison operation.
* It is not strictly required by using hash_equals (https://www.php.net/manual/en/function.hash-equals.php),
* but it is a second layer of security to prevent timing attacks.
*
* @param string $a
* @param string $b
*
* @return bool
* @throws \Exception
*/
protected function hash_equals($a, $b) {
if (function_exists('random_bytes')) {
$key = random_bytes(128);
} else {
$key = openssl_random_pseudo_bytes(128);
}
return hash_equals(hash_hmac('sha512', $a, $key), hash_hmac('sha512', $b, $key));
}
/**
* Stretch the key using the PBKDF2 algorithm
*