From: Florin Peter <github@florin-peter.de>
Date: Thu, 30 May 2013 23:35:48 +0000 (+0200)
Subject: use legacyDecrypt to decrypt key file like the previous files_encryption
X-Git-Tag: v6.0.0alpha2~642^2~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=986e9dd362809cedec783f55f161d6b3bce7d680;p=nextcloud-server.git

use legacyDecrypt to decrypt key file like the previous files_encryption
---

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 955425595ba..4e0e5c4b958 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -76,7 +76,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);
 
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index ddeb3590f60..d84a4d4e3c1 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -608,7 +608,7 @@ class Crypt {
 	 *
 	 * This function decrypts an content
 	 */
-	private static function legacyDecrypt($content, $passphrase = '') {
+	public static function legacyDecrypt($content, $passphrase = '') {
 
 		$bf = self::getBlowfish($passphrase);