diff options
author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-13 12:29:25 +0100 |
---|---|---|
committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-16 22:21:57 +0100 |
commit | c4f1de63a8ebe137566e034641b7bc3b05a05058 (patch) | |
tree | c238bc352ad6507bd40de7ed8eecedd03c470ce2 /apps/files_encryption/lib/crypt.php | |
parent | 42b99b6d0fbcaf54b3cf3b3c9be5bc8a9c7a2e12 (diff) | |
download | nextcloud-server-c4f1de63a8ebe137566e034641b7bc3b05a05058.tar.gz nextcloud-server-c4f1de63a8ebe137566e034641b7bc3b05a05058.zip |
Fix PHPDoc in /apps
Diffstat (limited to 'apps/files_encryption/lib/crypt.php')
-rwxr-xr-x | apps/files_encryption/lib/crypt.php | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index 7d86eb72ed1..5cdc92e85f7 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -125,7 +125,7 @@ class Crypt { /**
* @brief Check if a file's contents contains an IV and is symmetrically encrypted
- * @param $content
+ * @param string $content
* @return boolean
* @note see also OCA\Encryption\Util->isEncryptedPath()
*/
@@ -179,10 +179,9 @@ class Crypt { /**
* @brief Check if a file is encrypted via legacy system
- * @param $data
+ * @param boolean $isCatFileContent
* @param string $relPath The path of the file, relative to user/data;
* e.g. filename or /Docs/filename, NOT admin/files/filename
- * @param boolean $isCatFileContent
* @return boolean
*/
public static function isLegacyEncryptedContent($isCatFileContent, $relPath) {
@@ -323,7 +322,7 @@ class Crypt { /**
* @brief Symmetrically decrypts keyfile content
- * @param $keyfileContent
+ * @param string $keyfileContent
* @param string $passphrase
* @throws \Exception
* @return string|false
@@ -362,7 +361,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
- * @return encrypted private key or false
+ * @return string|false encrypted private key or false
*
* This function decrypts a file
*/
@@ -435,9 +434,9 @@ class Crypt { /**
* @brief Asymmetrically encrypt a file using multiple public keys
- * @param $encryptedContent
- * @param $shareKey
- * @param $privateKey
+ * @param string $encryptedContent
+ * @param string $shareKey
+ * @param mixed $privateKey
* @return false|string
* @internal param string $plainContent content to be encrypted
* @return string $plainContent decrypted string
@@ -498,7 +497,7 @@ class Crypt { /**
* @brief Generate a pseudo random 256-bit ASCII key, used as file key
- * @return $key Generated key
+ * @return string|false Generated key
*/
public static function generateKey() {
@@ -524,7 +523,7 @@ class Crypt { /**
* @brief Get the blowfish encryption handler for a key
- * @param $key string (optional)
+ * @param string $key (optional)
* @return \Crypt_Blowfish blowfish object
*
* if the key is left out, the default handler will be used
@@ -561,7 +560,7 @@ class Crypt { }
/**
- * @param $data
+ * @param string $data
* @param string $key
* @param int $maxLength
* @return string
|