From 1a3f7891ea86f108fbd984b12fe047ffacb20efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Mon, 27 May 2013 15:31:26 +0200 Subject: [PATCH] remove unused varaibles --- apps/files_encryption/lib/crypt.php | 4 +--- apps/files_encryption/lib/util.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index f5b7a8a0a4..8e3522917d 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -640,11 +640,9 @@ class Crypt * @param $legacyEncryptedContent * @param $legacyPassphrase * @param $publicKeys - * @param $newPassphrase - * @param $path * @return array */ - public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path ) { + public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys ) { $decrypted = self::legacyBlockDecrypt( $legacyEncryptedContent, $legacyPassphrase ); diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index cac67d496e..7f34d21682 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -720,7 +720,7 @@ class Util $publicKeys = Keymanager::getPublicKeys( $this->view, $uniqueUserIds ); // Recrypt data, generate catfile - $recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKeys, $newPassphrase, $legacyFile['path'] ); + $recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKeys ); $rawPath = $legacyFile['path']; $relPath = $this->stripUserFilesPath( $rawPath );