diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-31 01:35:48 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-31 01:35:48 +0200 |
| commit | 986e9dd362809cedec783f55f161d6b3bce7d680 (patch) | |
| tree | 57b00877d23b23e52df28d57addee450cae88880 /apps | |
| parent | 4f9cbadfa437c72db03e5d6def76d6d9103453b1 (diff) | |
| download | nextcloud-server-986e9dd362809cedec783f55f161d6b3bce7d680.tar.gz nextcloud-server-986e9dd362809cedec783f55f161d6b3bce7d680.zip | |
use legacyDecrypt to decrypt key file like the previous files_encryption
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_encryption/hooks/hooks.php | 2 | ||||
| -rwxr-xr-x | apps/files_encryption/lib/crypt.php | 2 |
2 files changed, 2 insertions, 2 deletions
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);
|