]> source.dussan.org Git - nextcloud-server.git/commitdiff
remove unused varaibles
authorBjörn Schießle <schiessle@owncloud.com>
Mon, 27 May 2013 13:31:26 +0000 (15:31 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 27 May 2013 13:31:26 +0000 (15:31 +0200)
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/util.php

index f5b7a8a0a40394af9a27bfec45fde1bd0a00cb38..8e3522917d56b1be12be2bcdfa77dc98847fff94 100755 (executable)
@@ -640,11 +640,9 @@ class Crypt
         * @param $legacyEncryptedContent\r
         * @param $legacyPassphrase\r
         * @param $publicKeys\r
-        * @param $newPassphrase\r
-        * @param $path\r
         * @return array\r
         */\r
-       public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path ) {\r
+       public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys ) {\r
 \r
                $decrypted = self::legacyBlockDecrypt( $legacyEncryptedContent, $legacyPassphrase );\r
 \r
index cac67d496e8261ac34e6c5221e8d03138ca072eb..7f34d21682d0bbeb22a7e42064896bbb8c019a09 100644 (file)
@@ -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 );