always save key file, the key doesn't change but the encrypted keyfile change always the same way like the share-keys change
This commit is contained in:
parent
a646a1169f
commit
bd3024242f
|
@ -114,8 +114,6 @@ class Proxy extends \OC_FileProxy {
|
|||
// Check if there is an existing key we can reuse
|
||||
if ( $encKeyfile = Keymanager::getFileKey( $rootView, $fileOwner, $filePath ) ) {
|
||||
|
||||
$keyPreExists = true;
|
||||
|
||||
// Fetch shareKey
|
||||
$shareKey = Keymanager::getShareKey( $rootView, $userId, $filePath );
|
||||
|
||||
|
@ -127,8 +125,6 @@ class Proxy extends \OC_FileProxy {
|
|||
|
||||
} else {
|
||||
|
||||
$keyPreExists = false;
|
||||
|
||||
// Make a new key
|
||||
$plainKey = Crypt::generateKey();
|
||||
|
||||
|
@ -157,14 +153,9 @@ class Proxy extends \OC_FileProxy {
|
|||
// Set encrypted keyfile as common varname
|
||||
$encKey = $multiEncrypted['data'];
|
||||
|
||||
// Save the key if its new
|
||||
if ( ! $keyPreExists ) {
|
||||
|
||||
// Save keyfile for newly encrypted file in parallel directory tree
|
||||
Keymanager::setFileKey( $rootView, $filePath, $fileOwner, $encKey );
|
||||
|
||||
}
|
||||
|
||||
// Replace plain content with encrypted content by reference
|
||||
$data = $encData;
|
||||
|
||||
|
|
Loading…
Reference in New Issue