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

Use random_bytes #20915

Merged
merged 1 commit into from
May 11, 2020
Merged

Use random_bytes #20915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 13 additions & 7 deletions lib/private/Security/Crypto.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,14 @@ class Crypto implements ICrypto {
private $ivLength = 16;
/** @var IConfig */
private $config;
/** @var ISecureRandom */
private $random;

/**
* @param IConfig $config
* @param ISecureRandom $random
*/
public function __construct(IConfig $config, ISecureRandom $random) {
public function __construct(IConfig $config) {
$this->cipher = new AES();
$this->config = $config;
$this->random = $random;
}

/**
Expand Down Expand Up @@ -95,13 +92,14 @@ public function encrypt(string $plaintext, string $password = ''): string {
}
$this->cipher->setPassword($password);

$iv = $this->random->generate($this->ivLength);
$iv = \random_bytes($this->ivLength);
nickvergessen marked this conversation as resolved.
Show resolved Hide resolved
$this->cipher->setIV($iv);

$ciphertext = bin2hex($this->cipher->encrypt($plaintext));
$iv = bin2hex($iv);
$hmac = bin2hex($this->calculateHMAC($ciphertext.$iv, $password));

return $ciphertext.'|'.$iv.'|'.$hmac;
return $ciphertext.'|'.$iv.'|'.$hmac.'|2';
}

/**
Expand All @@ -119,14 +117,22 @@ public function decrypt(string $authenticatedCiphertext, string $password = ''):
$this->cipher->setPassword($password);

$parts = explode('|', $authenticatedCiphertext);
if (\count($parts) !== 3) {
$partCount = \count($parts);
if ($partCount < 3 || $partCount > 4) {
throw new \Exception('Authenticated ciphertext could not be decoded.');
}

$ciphertext = hex2bin($parts[0]);
$iv = $parts[1];
$hmac = hex2bin($parts[2]);

if ($partCount === 4) {
$version = $parts[3];
if ($version === '2') {
$iv = hex2bin($iv);
}
}

$this->cipher->setIV($iv);

if (!hash_equals($this->calculateHMAC($parts[0] . $parts[1], $password), $hmac)) {
Expand Down
15 changes: 11 additions & 4 deletions tests/lib/Security/CryptoTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function defaultEncryptionProvider() {

protected function setUp(): void {
parent::setUp();
$this->crypto = new Crypto(\OC::$server->getConfig(), \OC::$server->getSecureRandom());
$this->crypto = new Crypto(\OC::$server->getConfig());
}

/**
Expand All @@ -35,7 +35,7 @@ public function testDefaultEncrypt($stringToEncrypt) {
$this->assertEquals($stringToEncrypt, $this->crypto->decrypt($ciphertext));
}


public function testWrongPassword() {
$this->expectException(\Exception::class);
$this->expectExceptionMessage('HMAC does not match.');
Expand All @@ -51,7 +51,7 @@ public function testLaterDecryption() {
$this->assertEquals($stringToEncrypt, $this->crypto->decrypt($encryptedString, 'ThisIsAVeryS3cur3P4ssw0rd'));
}


public function testWrongIV() {
$this->expectException(\Exception::class);
$this->expectExceptionMessage('HMAC does not match.');
Expand All @@ -60,12 +60,19 @@ public function testWrongIV() {
$this->crypto->decrypt($encryptedString, 'ThisIsAVeryS3cur3P4ssw0rd');
}


public function testWrongParameters() {
$this->expectException(\Exception::class);
$this->expectExceptionMessage('Authenticated ciphertext could not be decoded.');

$encryptedString = '1|2';
$this->crypto->decrypt($encryptedString, 'ThisIsAVeryS3cur3P4ssw0rd');
}

public function testLegacy() {
$cipherText = 'e16599188e3d212f5c7f17fdc2abca46|M1WfLAxbcAmITeD6|509457885d6ca5e6c3bfd3741852687a7f2bffce197f8d5ae97b65818b15a1b7f616b68326ff312371540f4ca8ac55f8e2de4aa13aab3474bd3431e51214e3ee';
$password = 'mypass';

$this->assertSame('legacy test', $this->crypto->decrypt($cipherText, $password));
}
}