aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/hooks
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2013-06-13 03:54:19 -0700
committerBjörn Schießle <bjoern@schiessle.org>2013-06-13 03:54:19 -0700
commitdd8011925acbd701de10e604b377c3d7f01aeff8 (patch)
tree30938e61873554edd056de942189ac3851e9d488 /apps/files_encryption/hooks
parent54f3174665262a5d1b1e1135667342b17b5d05b0 (diff)
parentbc2862fcb947ac65c80b5d49ea8f2c2271eb8021 (diff)
downloadnextcloud-server-dd8011925acbd701de10e604b377c3d7f01aeff8.tar.gz
nextcloud-server-dd8011925acbd701de10e604b377c3d7f01aeff8.zip
Merge pull request #3552 from owncloud/files_encryption_upgrade_fix
Fix files_encryption app upgrade from 4.5 to 5.0
Diffstat (limited to 'apps/files_encryption/hooks')
-rw-r--r--apps/files_encryption/hooks/hooks.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 7e68f476a7f..0580b713d1a 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -84,7 +84,7 @@ class Hooks {
&& $encLegacyKey = $userView->file_get_contents('encryption.key')
) {
- $plainLegacyKey = Crypt::legacyBlockDecrypt($encLegacyKey, $params['password']);
+ $plainLegacyKey = Crypt::legacyDecrypt($encLegacyKey, $params['password']);
$session->setLegacyKey($plainLegacyKey);