From df22a7c4954acb67c9365f9900bd7a3f70f13487 Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Mon, 27 May 2013 12:21:39 +0200 Subject: make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes --- apps/files_encryption/lib/crypt.php | 2 +- apps/files_encryption/lib/proxy.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/files_encryption/lib') diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index 009a648016b..9345712a455 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -607,7 +607,7 @@ class Crypt * * This function decrypts an content */ - public static function legacyDecrypt( $content, $passphrase = '' ) { + private static function legacyDecrypt( $content, $passphrase = '' ) { $bf = self::getBlowfish( $passphrase ); diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index eaaeae9b619..d9520810bf4 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -223,7 +223,7 @@ class Proxy extends \OC_FileProxy && isset( $_SESSION['legacyenckey'] ) && Crypt::isEncryptedMeta( $path ) ) { - $plainData = Crypt::legacyDecrypt( $data, $session->getLegacyKey() ); + $plainData = Crypt::legacyBlockDecrypt( $data, $session->getLegacyKey() ); } \OC_FileProxy::$enabled = $proxyStatus; -- cgit v1.2.3