remove unused varaibles
This commit is contained in:
parent
5e243b48bb
commit
1a3f7891ea
|
@ -640,11 +640,9 @@ class Crypt
|
||||||
* @param $legacyEncryptedContent
|
* @param $legacyEncryptedContent
|
||||||
* @param $legacyPassphrase
|
* @param $legacyPassphrase
|
||||||
* @param $publicKeys
|
* @param $publicKeys
|
||||||
* @param $newPassphrase
|
|
||||||
* @param $path
|
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path ) {
|
public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys ) {
|
||||||
|
|
||||||
$decrypted = self::legacyBlockDecrypt( $legacyEncryptedContent, $legacyPassphrase );
|
$decrypted = self::legacyBlockDecrypt( $legacyEncryptedContent, $legacyPassphrase );
|
||||||
|
|
||||||
|
|
|
@ -720,7 +720,7 @@ class Util
|
||||||
$publicKeys = Keymanager::getPublicKeys( $this->view, $uniqueUserIds );
|
$publicKeys = Keymanager::getPublicKeys( $this->view, $uniqueUserIds );
|
||||||
|
|
||||||
// Recrypt data, generate catfile
|
// Recrypt data, generate catfile
|
||||||
$recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKeys, $newPassphrase, $legacyFile['path'] );
|
$recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKeys );
|
||||||
|
|
||||||
$rawPath = $legacyFile['path'];
|
$rawPath = $legacyFile['path'];
|
||||||
$relPath = $this->stripUserFilesPath( $rawPath );
|
$relPath = $this->stripUserFilesPath( $rawPath );
|
||||||
|
|
Loading…
Reference in New Issue