Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
fcf4e2a4
Commit
fcf4e2a4
authored
10 years ago
by
Lukas Reschke
Browse files
Options
Downloads
Plain Diff
Merge pull request #13471 from owncloud/fix-blog-typo
fix typo of blog -> changed to block
parents
4894a2c4
2229290c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/files_encryption/exception/encryptionexception.php
+1
-1
1 addition, 1 deletion
apps/files_encryption/exception/encryptionexception.php
apps/files_encryption/lib/stream.php
+1
-1
1 addition, 1 deletion
apps/files_encryption/lib/stream.php
with
2 additions
and
2 deletions
apps/files_encryption/exception/encryptionexception.php
+
1
−
1
View file @
fcf4e2a4
...
@@ -40,7 +40,7 @@ namespace OCA\Files_Encryption\Exception;
...
@@ -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_BLO
G
_SIZE
=
30
;
const
UNEXPECTED_BLO
CK
_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
;
...
...
This diff is collapsed.
Click to expand it.
apps/files_encryption/lib/stream.php
+
1
−
1
View file @
fcf4e2a4
...
@@ -260,7 +260,7 @@ class Stream {
...
@@ -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 blo
g
size of 8192 byte'
,
EncryptionException
::
UNEXPECTED_BLO
G
_SIZE
);
throw
new
EncryptionException
(
'expected a blo
ck
size of 8192 byte'
,
EncryptionException
::
UNEXPECTED_BLO
CK
_SIZE
);
}
}
// Get the data from the file handle
// Get the data from the file handle
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment