]> source.dussan.org Git - nextcloud-server.git/commitdiff
use legacyDecrypt to decrypt key file like the previous files_encryption
authorFlorin Peter <github@florin-peter.de>
Thu, 30 May 2013 23:35:48 +0000 (01:35 +0200)
committerFlorin Peter <github@florin-peter.de>
Thu, 30 May 2013 23:35:48 +0000 (01:35 +0200)
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php

index 955425595ba523dedc7e41e39b6d58f3177554b1..4e0e5c4b95805c6cfe178284b72b5efeb6cad71f 100644 (file)
@@ -76,7 +76,7 @@ class Hooks {
                                && $encLegacyKey = $userView->file_get_contents('encryption.key')\r
                        ) {\r
 \r
-                               $plainLegacyKey = Crypt::legacyBlockDecrypt($encLegacyKey, $params['password']);\r
+                               $plainLegacyKey = Crypt::legacyDecrypt($encLegacyKey, $params['password']);\r
 \r
                                $session->setLegacyKey($plainLegacyKey);\r
 \r
index ddeb3590f6032c1e5822f46291f8e5e8cc247171..d84a4d4e3c1e1bfc4b0dd32c6ab331fb6b282b80 100755 (executable)
@@ -608,7 +608,7 @@ class Crypt {
         *\r
         * This function decrypts an content\r
         */\r
-       private static function legacyDecrypt($content, $passphrase = '') {\r
+       public static function legacyDecrypt($content, $passphrase = '') {\r
 \r
                $bf = self::getBlowfish($passphrase);\r
 \r