diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-05-13 12:36:01 +0200 |
---|---|---|
committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-13 19:09:15 +0100 |
commit | 58857b8df54e0ebff650b81cc070bf170873b4c2 (patch) | |
tree | 5209c89fd5903f87f4a4501e334e71da7880fa92 /apps/files_encryption | |
parent | 55fc693750480f7adb84d922840013b90b408a7d (diff) | |
download | nextcloud-server-58857b8df54e0ebff650b81cc070bf170873b4c2.tar.gz nextcloud-server-58857b8df54e0ebff650b81cc070bf170873b4c2.zip |
@returns -> @return
Diffstat (limited to 'apps/files_encryption')
-rwxr-xr-x | apps/files_encryption/lib/crypt.php | 14 | ||||
-rw-r--r-- | apps/files_encryption/lib/session.php | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index a4f7bd35497..7d86eb72ed1 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -254,7 +254,7 @@ class Crypt { * @brief Concatenate encrypted data with its IV and padding
* @param string $content content to be concatenated
* @param string $iv IV to be concatenated
- * @returns string concatenated content
+ * @return string concatenated content
*/
private static function concatIv($content, $iv) {
@@ -267,7 +267,7 @@ class Crypt { /**
* @brief Split concatenated data and IV into respective parts
* @param string $catFile concatenated data to be split
- * @returns array keys: encrypted, iv
+ * @return array keys: encrypted, iv
*/
private static function splitIv($catFile) {
@@ -330,7 +330,7 @@ class Crypt { * @internal param string $source
* @internal param string $target
* @internal param string $key the decryption key
- * @returns string decrypted content
+ * @return string decrypted content
*
* This function decrypts a file
*/
@@ -362,7 +362,7 @@ class Crypt { * @brief Decrypt private key and check if the result is a valid keyfile
* @param string $encryptedKey encrypted keyfile
* @param string $passphrase to decrypt keyfile
- * @returns encrypted private key or false
+ * @return encrypted private key or false
*
* This function decrypts a file
*/
@@ -389,7 +389,7 @@ class Crypt { * @brief Create asymmetrically encrypted keyfile content using a generated key
* @param string $plainContent content to be encrypted
* @param array $publicKeys array keys must be the userId of corresponding user
- * @returns array keys: keys (array, key = userId), data
+ * @return array keys: keys (array, key = userId), data
* @note symmetricDecryptFileContent() can decrypt files created using this method
*/
public static function multiKeyEncrypt($plainContent, array $publicKeys) {
@@ -440,7 +440,7 @@ class Crypt { * @param $privateKey
* @return false|string
* @internal param string $plainContent content to be encrypted
- * @returns string $plainContent decrypted string
+ * @return string $plainContent decrypted string
* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
*
* This function decrypts a file
@@ -498,7 +498,7 @@ class Crypt { /**
* @brief Generate a pseudo random 256-bit ASCII key, used as file key
- * @returns $key Generated key
+ * @return $key Generated key
*/
public static function generateKey() {
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php index 19b669a27ff..dea27d7a186 100644 --- a/apps/files_encryption/lib/session.php +++ b/apps/files_encryption/lib/session.php @@ -145,7 +145,7 @@ class Session { /** * @brief Gets status if we already tried to initialize the encryption app - * @returns init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INOITIALIZED + * @return init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INOITIALIZED * * @note this doesn not indicate of the init was successful, we just remeber the try! */ @@ -159,7 +159,7 @@ class Session { /** * @brief Gets user or public share private key from session - * @returns string $privateKey The user's plaintext private key + * @return string $privateKey The user's plaintext private key * */ public function getPrivateKey() { @@ -190,7 +190,7 @@ class Session { /** * @brief Gets public share private key from session - * @returns string $privateKey + * @return string $privateKey * */ public function getPublicSharePrivateKey() { @@ -217,7 +217,7 @@ class Session { /** * @brief Gets user legacy key from session - * @returns string $legacyKey The user's plaintext legacy key + * @return string $legacyKey The user's plaintext legacy key * */ public function getLegacyKey() { |