summaryrefslogtreecommitdiffstats
path: root/apps/encryption
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-04-11 23:16:27 -0500
committerMorris Jobke <hey@morrisjobke.de>2017-04-11 23:16:27 -0500
commit1729e4471f41e560f78f6b7269bcdb73e24602d5 (patch)
treed9850ee89a893efd8f746c4bbc71b8c9eae9a55b /apps/encryption
parent6bd1c50dc32ccc208723ef08af72b8bfe99b58bb (diff)
downloadnextcloud-server-1729e4471f41e560f78f6b7269bcdb73e24602d5.tar.gz
nextcloud-server-1729e4471f41e560f78f6b7269bcdb73e24602d5.zip
Update comments to Nextcloud
* based on PR by @Ardinis * see #4311 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/encryption')
-rw-r--r--apps/encryption/lib/Crypto/Crypt.php6
-rw-r--r--apps/encryption/lib/Crypto/Encryption.php2
-rw-r--r--apps/encryption/lib/Hooks/UserHooks.php2
-rw-r--r--apps/encryption/lib/KeyManager.php2
-rw-r--r--apps/encryption/tests/Crypto/EncryptionTest.php2
5 files changed, 7 insertions, 7 deletions
diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php
index 4303cb9e940..9a9ac27b96f 100644
--- a/apps/encryption/lib/Crypto/Crypt.php
+++ b/apps/encryption/lib/Crypto/Crypt.php
@@ -38,7 +38,7 @@ use OCP\ILogger;
use OCP\IUserSession;
/**
- * Class Crypt provides the encryption implementation of the default ownCloud
+ * Class Crypt provides the encryption implementation of the default Nextcloud
* encryption module. As default AES-256-CTR is used, it does however offer support
* for the following modes:
*
@@ -54,10 +54,10 @@ use OCP\IUserSession;
class Crypt {
const DEFAULT_CIPHER = 'AES-256-CTR';
- // default cipher from old ownCloud versions
+ // default cipher from old Nextcloud versions
const LEGACY_CIPHER = 'AES-128-CFB';
- // default key format, old ownCloud version encrypted the private key directly
+ // default key format, old Nextcloud version encrypted the private key directly
// with the user password
const LEGACY_KEY_FORMAT = 'password';
diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php
index fdcbd41a09c..7f7665a24fc 100644
--- a/apps/encryption/lib/Crypto/Encryption.php
+++ b/apps/encryption/lib/Crypto/Encryption.php
@@ -458,7 +458,7 @@ class Encryption implements IEncryptionModule {
/**
* get size of the unencrypted payload per block.
- * ownCloud read/write files with a block size of 8192 byte
+ * Nextcloud read/write files with a block size of 8192 byte
*
* @param bool $signed
* @return int
diff --git a/apps/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php
index d189ce3eeef..e0826e2c7e3 100644
--- a/apps/encryption/lib/Hooks/UserHooks.php
+++ b/apps/encryption/lib/Hooks/UserHooks.php
@@ -236,7 +236,7 @@ class UserHooks implements IHook {
}
/**
- * If the password can't be changed within ownCloud, than update the key password in advance.
+ * If the password can't be changed within Nextcloud, than update the key password in advance.
*
* @param array $params : uid, password
* @return boolean|null
diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index 32872ae99b3..6b260c39bfb 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -687,7 +687,7 @@ class KeyManager {
public function getMasterKeyPassword() {
$password = $this->config->getSystemValue('secret');
if (empty($password)){
- throw new \Exception('Can not get secret from ownCloud instance');
+ throw new \Exception('Can not get secret from Nextcloud instance');
}
return $password;
diff --git a/apps/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php
index 3525d2d4aec..7e074a5b9e8 100644
--- a/apps/encryption/tests/Crypto/EncryptionTest.php
+++ b/apps/encryption/tests/Crypto/EncryptionTest.php
@@ -345,7 +345,7 @@ class EncryptionTest extends TestCase {
}
/**
- * Test case if the public key is missing. ownCloud should still encrypt
+ * Test case if the public key is missing. Nextcloud should still encrypt
* the file for the remaining users
*/
public function testUpdateMissingPublicKey() {