diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-05-27 12:21:39 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-05-27 17:35:28 +0200 |
| commit | df22a7c4954acb67c9365f9900bd7a3f70f13487 (patch) | |
| tree | 7da644cb3478e26ca29e21b83964ae071e47836d /apps/files_encryption/lib | |
| parent | 8b355788333f9078066b3f877c4e5c1c4001597c (diff) | |
| download | nextcloud-server-df22a7c4954acb67c9365f9900bd7a3f70f13487.tar.gz nextcloud-server-df22a7c4954acb67c9365f9900bd7a3f70f13487.zip | |
make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes
Diffstat (limited to 'apps/files_encryption/lib')
| -rwxr-xr-x | apps/files_encryption/lib/crypt.php | 2 | ||||
| -rw-r--r-- | apps/files_encryption/lib/proxy.php | 2 |
2 files changed, 2 insertions, 2 deletions
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; |