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

Merge pull request #13471 from owncloud/fix-blog-typo 

fix typo of blog -> changed to block
This commit is contained in:
Lukas Reschke 2015-01-19 17:54:32 +01:00
parent 4894a2c458 2229290cca
commit fcf4e2a44c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_encryption/exception/encryptionexception.php
View File

@ -40,7 +40,7 @@ namespace OCA\Files_Encryption\Exception;
class EncryptionException extends \Exception { class EncryptionException extends \Exception {
const GENERIC = 10; const GENERIC = 10;
const UNEXPECTED_END_OF_ENCRYPTION_HEADER = 20; const UNEXPECTED_END_OF_ENCRYPTION_HEADER = 20;
const UNEXPECTED_BLOG_SIZE = 30; const UNEXPECTED_BLOCK_SIZE = 30;
const ENCRYPTION_HEADER_TO_LARGE = 40; const ENCRYPTION_HEADER_TO_LARGE = 40;
const UNKNOWN_CIPHER = 50; const UNKNOWN_CIPHER = 50;
const ENCRYPTION_FAILED = 60; const ENCRYPTION_FAILED = 60;

2
apps/files_encryption/lib/stream.php
View File

@ -260,7 +260,7 @@ class Stream {
if ($count !== Crypt::BLOCKSIZE) { if ($count !== Crypt::BLOCKSIZE) {
\OCP\Util::writeLog('Encryption library', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL); \OCP\Util::writeLog('Encryption library', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL);
throw new EncryptionException('expected a blog size of 8192 byte', EncryptionException::UNEXPECTED_BLOG_SIZE); throw new EncryptionException('expected a block size of 8192 byte', EncryptionException::UNEXPECTED_BLOCK_SIZE);
} }
// Get the data from the file handle // Get the data from the file handle