diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-01-19 17:54:32 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-01-19 17:54:32 +0100 |
| commit | fcf4e2a44c7af6e507582aa260e0d87ded39a89c (patch) | |
| tree | a499eade8b15dda4582342d36c187654fb7aff54 | |
| parent | 4894a2c458f49b2c6b49b18cc0055ae087bff1b2 (diff) | |
| parent | 2229290cca65d4cc0ccb8ea5dba6a6b80c6bbded (diff) | |
| download | nextcloud-server-fcf4e2a44c7af6e507582aa260e0d87ded39a89c.tar.gz nextcloud-server-fcf4e2a44c7af6e507582aa260e0d87ded39a89c.zip | |
Merge pull request #13471 from owncloud/fix-blog-typo
fix typo of blog -> changed to block
| -rw-r--r-- | apps/files_encryption/exception/encryptionexception.php | 2 | ||||
| -rw-r--r-- | apps/files_encryption/lib/stream.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_encryption/exception/encryptionexception.php b/apps/files_encryption/exception/encryptionexception.php index 2fb679e91d2..24ffaff6f73 100644 --- a/apps/files_encryption/exception/encryptionexception.php +++ b/apps/files_encryption/exception/encryptionexception.php @@ -40,7 +40,7 @@ namespace OCA\Files_Encryption\Exception; class EncryptionException extends \Exception { const GENERIC = 10; const UNEXPECTED_END_OF_ENCRYPTION_HEADER = 20; - const UNEXPECTED_BLOG_SIZE = 30; + const UNEXPECTED_BLOCK_SIZE = 30; const ENCRYPTION_HEADER_TO_LARGE = 40; const UNKNOWN_CIPHER = 50; const ENCRYPTION_FAILED = 60; diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php index b039e808c24..644ac895a8f 100644 --- a/apps/files_encryption/lib/stream.php +++ b/apps/files_encryption/lib/stream.php @@ -260,7 +260,7 @@ class Stream { if ($count !== Crypt::BLOCKSIZE) { \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 |