|
@@ -96,7 +96,7 @@ discard block |
|
|
block discarded – undo |
|
96
|
96
|
*/ |
|
97
|
97
|
public function __construct(SettingsService $settings) { |
|
98
|
98
|
$this->cipher = $settings->getAppSetting('server_side_encryption'); |
|
99
|
|
- $this->rounds = (int)100; |
|
|
99
|
+ $this->rounds = (int) 100; |
|
100
|
100
|
$this->server_key = \OC::$server->getConfig()->getSystemValue('passwordsalt', ''); |
|
101
|
101
|
} |
|
102
|
102
|
|
|
@@ -295,7 +295,7 @@ discard block |
|
|
block discarded – undo |
|
295
|
295
|
|
|
296
|
296
|
|
|
297
|
297
|
|
|
298
|
|
- private function extractKeysFromCredential($credential){ |
|
|
298
|
+ private function extractKeysFromCredential($credential) { |
|
299
|
299
|
$userKey = ''; |
|
300
|
300
|
$userSuppliedKey = ''; |
|
301
|
301
|
if ($credential instanceof Credential) { |
Please login to merge, or discard this patch.