mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

always throw a encryption exception 

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2017-03-14 11:31:46 +01:00
parent 8d91c84ec4
commit 9ce32d9941
No known key found for this signature in database
GPG Key ID: 2378A753E2BF04F6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/encryption/lib/Crypto/Crypt.php
View File

@ -29,7 +29,6 @@ namespace OCA\Encryption\Crypto;
use OC\Encryption\Exceptions\DecryptionFailedException;
use OC\Encryption\Exceptions\EncryptionFailedException;
use OC\HintException;
use OCA\Encryption\Exceptions\MultiKeyDecryptException;
use OCA\Encryption\Exceptions\MultiKeyEncryptException;
use OCP\Encryption\Exceptions\GenericEncryptionException;
@ -476,12 +475,12 @@ class Crypt {
* @param string $data
* @param string $passPhrase
* @param string $expectedSignature
* @throws HintException
* @throws GenericEncryptionException
*/
private function checkSignature($data, $passPhrase, $expectedSignature) {
$signature = $this->createSignature($data, $passPhrase);
if (!hash_equals($expectedSignature, $signature)) {
throw new HintException('Bad Signature', $this->l->t('Bad Signature'));
throw new GenericEncryptionException('Bad Signature', $this->l->t('Bad Signature'));
}
}
@ -552,7 +551,7 @@ class Crypt {
* @param string $catFile
* @param string $cipher
* @return bool
* @throws HintException
* @throws GenericEncryptionException
*/
private function hasSignature($catFile, $cipher) {
$meta = substr($catFile, -93);
@ -560,7 +559,7 @@ class Crypt {
// enforce signature for the new 'CTR' ciphers
if ($signaturePosition === false && strpos(strtolower($cipher), 'ctr') !== false) {
throw new HintException('Missing Signature', $this->l->t('Missing Signature'));
throw new GenericEncryptionException('Missing Signature', $this->l->t('Missing Signature'));
}
return ($signaturePosition !== false);

2
apps/encryption/tests/Crypto/CryptTest.php
View File

@ -247,7 +247,7 @@ class CryptTest extends TestCase {
/**
* @dataProvider dataTestHasSignatureFail
* @expectedException \OC\HintException
* @expectedException \OCP\Encryption\Exceptions\GenericEncryptionException
*/
public function testHasSignatureFail($cipher) {
$data = 'encryptedContent00iv001234567890123456xx';