Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
58857b8d
Commit
58857b8d
authored
10 years ago
by
Thomas Müller
Committed by
Robin McCorkell
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
@returns -> @return
parent
55fc6937
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
apps/files_encryption/lib/crypt.php
+7
-7
7 additions, 7 deletions
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/session.php
+4
-4
4 additions, 4 deletions
apps/files_encryption/lib/session.php
apps/files_versions/lib/versions.php
+1
-1
1 addition, 1 deletion
apps/files_versions/lib/versions.php
with
12 additions
and
12 deletions
apps/files_encryption/lib/crypt.php
+
7
−
7
View file @
58857b8d
...
@@ -254,7 +254,7 @@ class Crypt {
...
@@ -254,7 +254,7 @@ class Crypt {
* @brief Concatenate encrypted data with its IV and padding
* @brief Concatenate encrypted data with its IV and padding
* @param string $content content to be concatenated
* @param string $content content to be concatenated
* @param string $iv IV to be concatenated
* @param string $iv IV to be concatenated
* @return
s
string concatenated content
* @return string concatenated content
*/
*/
private
static
function
concatIv
(
$content
,
$iv
)
{
private
static
function
concatIv
(
$content
,
$iv
)
{
...
@@ -267,7 +267,7 @@ class Crypt {
...
@@ -267,7 +267,7 @@ class Crypt {
/**
/**
* @brief Split concatenated data and IV into respective parts
* @brief Split concatenated data and IV into respective parts
* @param string $catFile concatenated data to be split
* @param string $catFile concatenated data to be split
* @return
s
array keys: encrypted, iv
* @return array keys: encrypted, iv
*/
*/
private
static
function
splitIv
(
$catFile
)
{
private
static
function
splitIv
(
$catFile
)
{
...
@@ -330,7 +330,7 @@ class Crypt {
...
@@ -330,7 +330,7 @@ class Crypt {
* @internal param string $source
* @internal param string $source
* @internal param string $target
* @internal param string $target
* @internal param string $key the decryption key
* @internal param string $key the decryption key
* @return
s
string decrypted content
* @return string decrypted content
*
*
* This function decrypts a file
* This function decrypts a file
*/
*/
...
@@ -362,7 +362,7 @@ class Crypt {
...
@@ -362,7 +362,7 @@ class Crypt {
* @brief Decrypt private key and check if the result is a valid keyfile
* @brief Decrypt private key and check if the result is a valid keyfile
* @param string $encryptedKey encrypted keyfile
* @param string $encryptedKey encrypted keyfile
* @param string $passphrase to decrypt keyfile
* @param string $passphrase to decrypt keyfile
* @return
s
encrypted private key or false
* @return encrypted private key or false
*
*
* This function decrypts a file
* This function decrypts a file
*/
*/
...
@@ -389,7 +389,7 @@ class Crypt {
...
@@ -389,7 +389,7 @@ class Crypt {
* @brief Create asymmetrically encrypted keyfile content using a generated key
* @brief Create asymmetrically encrypted keyfile content using a generated key
* @param string $plainContent content to be encrypted
* @param string $plainContent content to be encrypted
* @param array $publicKeys array keys must be the userId of corresponding user
* @param array $publicKeys array keys must be the userId of corresponding user
* @return
s
array keys: keys (array, key = userId), data
* @return array keys: keys (array, key = userId), data
* @note symmetricDecryptFileContent() can decrypt files created using this method
* @note symmetricDecryptFileContent() can decrypt files created using this method
*/
*/
public
static
function
multiKeyEncrypt
(
$plainContent
,
array
$publicKeys
)
{
public
static
function
multiKeyEncrypt
(
$plainContent
,
array
$publicKeys
)
{
...
@@ -440,7 +440,7 @@ class Crypt {
...
@@ -440,7 +440,7 @@ class Crypt {
* @param $privateKey
* @param $privateKey
* @return false|string
* @return false|string
* @internal param string $plainContent content to be encrypted
* @internal param string $plainContent content to be encrypted
* @return
s
string $plainContent decrypted string
* @return string $plainContent decrypted string
* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
*
*
* This function decrypts a file
* This function decrypts a file
...
@@ -498,7 +498,7 @@ class Crypt {
...
@@ -498,7 +498,7 @@ class Crypt {
/**
/**
* @brief Generate a pseudo random 256-bit ASCII key, used as file key
* @brief Generate a pseudo random 256-bit ASCII key, used as file key
* @return
s
$key Generated key
* @return $key Generated key
*/
*/
public
static
function
generateKey
()
{
public
static
function
generateKey
()
{
...
...
This diff is collapsed.
Click to expand it.
apps/files_encryption/lib/session.php
+
4
−
4
View file @
58857b8d
...
@@ -145,7 +145,7 @@ class Session {
...
@@ -145,7 +145,7 @@ class Session {
/**
/**
* @brief Gets status if we already tried to initialize the encryption app
* @brief Gets status if we already tried to initialize the encryption app
* @return
s
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!
* @note this doesn not indicate of the init was successful, we just remeber the try!
*/
*/
...
@@ -159,7 +159,7 @@ class Session {
...
@@ -159,7 +159,7 @@ class Session {
/**
/**
* @brief Gets user or public share private key from session
* @brief Gets user or public share private key from session
* @return
s
string $privateKey The user's plaintext private key
* @return string $privateKey The user's plaintext private key
*
*
*/
*/
public
function
getPrivateKey
()
{
public
function
getPrivateKey
()
{
...
@@ -190,7 +190,7 @@ class Session {
...
@@ -190,7 +190,7 @@ class Session {
/**
/**
* @brief Gets public share private key from session
* @brief Gets public share private key from session
* @return
s
string $privateKey
* @return string $privateKey
*
*
*/
*/
public
function
getPublicSharePrivateKey
()
{
public
function
getPublicSharePrivateKey
()
{
...
@@ -217,7 +217,7 @@ class Session {
...
@@ -217,7 +217,7 @@ class Session {
/**
/**
* @brief Gets user legacy key from session
* @brief Gets user legacy key from session
* @return
s
string $legacyKey The user's plaintext legacy key
* @return string $legacyKey The user's plaintext legacy key
*
*
*/
*/
public
function
getLegacyKey
()
{
public
function
getLegacyKey
()
{
...
...
This diff is collapsed.
Click to expand it.
apps/files_versions/lib/versions.php
+
1
−
1
View file @
58857b8d
...
@@ -265,7 +265,7 @@ class Storage {
...
@@ -265,7 +265,7 @@ class Storage {
* @param string $uid user id from the owner of the file
* @param string $uid user id from the owner of the file
* @param string $filename file to find versions of, relative to the user files dir
* @param string $filename file to find versions of, relative to the user files dir
* @param string $userFullPath
* @param string $userFullPath
* @return
s
array versions newest version first
* @return array versions newest version first
*/
*/
public
static
function
getVersions
(
$uid
,
$filename
,
$userFullPath
=
''
)
{
public
static
function
getVersions
(
$uid
,
$filename
,
$userFullPath
=
''
)
{
$versions
=
array
();
$versions
=
array
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment