Skip to content

Improve security & performance of Encrypt then MAC scheme. #23427

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

Closed
lynn-stephenson wants to merge 5 commits into from
Closed

Improve security & performance of Encrypt then MAC scheme. #23427

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96fd82e
Split single key into encryption & MAC key.
lynn-stephenson Oct 13, 2020
cebd718
Bump cryptographic payload version to 3.
lynn-stephenson Oct 13, 2020
79f4c68
Remove unused dependency and update docblock.
lynn-stephenson Oct 13, 2020
8ffbb4b
Remove unneeded call to hash function.
lynn-stephenson Oct 13, 2020
0ae57ce
Swap out phpseclib's HMAC function.
lynn-stephenson Oct 13, 2020
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
Prev Previous commit
Swap out phpseclib's HMAC function. 
PHP has a built-in function for HMAC, as such there is little reason to use phpseclib's slower implementation. I specifically modified the wrapper around the HMAC function to retain the same input/output.
  • Loading branch information
@lynn-stephenson
lynn-stephenson authored Oct 13, 2020
commit 0ae57ce5a2579e0ee59f124705dca12781eabd78
5 changes: 1 addition & 4 deletions lib/private/Security/Crypto.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
use OCP\IConfig;
use OCP\Security\ICrypto;
use phpseclib\Crypt\AES;
use phpseclib\Crypt\Hash;

/**
* Class Crypto provides a high-level encryption layer using AES-CBC. If no key has been provided
Expand Down Expand Up @@ -70,9 +69,7 @@ public function calculateHMAC(string $message, string $password = ''): string {
$password = $this->config->getSystemValue('secret');
}

$hash = new Hash('sha512');
$hash->setKey($password);
return $hash->hash($message);
return hash_hmac('sha512', $message, $password, true);
}

/**
Expand Down