summaryrefslogtreecommitdiffstats
path: root/apps/encryption
Commit message (Collapse)AuthorAgeFilesLines
* Update autloaderRoeland Jago Douma2020-09-241-1/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Bump versionsJoas Schilling2020-09-181-2/+2
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2020-09-152-0/+2
|
* [tx-robot] updated from transifexNextcloud bot2020-08-282-2/+2
|
* Update the license headers for Nextcloud 20Christoph Wurst2020-08-2413-2/+14
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* [tx-robot] updated from transifexNextcloud bot2020-08-212-0/+2
|
* Merge pull request #22018 from nextcloud/bugfix/noid/harden-key-generationMorris Jobke2020-08-195-39/+128
|\ | | | | Harden SSE key generation
| * Fix typo in error message Morris Jobke2020-08-191-1/+1
| | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Test for locking state in key generationJulius Härtl2020-08-142-5/+51
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Harden key generationJulius Härtl2020-08-143-34/+77
| | | | | | | | | | | | | | | | | | | | There might be cases where multiple requests trigger the key generation at the same time and the instance ends up with a non-fitting public/private key pair. Therefore the whole key generation should be locked. Other than that this makes sure that user key generation return values are properly validated. Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Add legacy scanning commandRoeland Jago Douma2020-08-194-1/+144
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Make legacy cipher opt inRoeland Jago Douma2020-08-193-12/+38
| | | | | | | | | | | | | | | | * Systems that upgrade have this enabled by default * New systems disable it * We'll have to add some wargning in the setup checks if this is enabled Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Fix some MissingDocblockType or InvalidDocblock warnings.Daniel Kesselberg2020-08-141-2/+1
|/ | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Merge pull request #22199 from ↵Morris Jobke2020-08-1214-100/+100
|\ | | | | | | | | nextcloud/techdebt/noid/PHPUnit_Framework_MockObject_MockObject Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to …
| * Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to ↵Morris Jobke2020-08-1214-100/+100
| | | | | | | | | | | | \PHPUnit\Framework\MockObject\MockObject Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | SSE enhancementRoeland Jago Douma2020-08-111-2/+8
|/ | | | | | | Do not blind concatenate ints. Lets add a _ between them. So that we can distrinquis them properly Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2020-07-312-0/+2
|
* Encryption is ready if master key is enabledJulius Härtl2020-07-211-0/+3
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Use DOMContentLoaded and fix sharebymail loading issueJohn Molakvoæ (skjnldsv)2020-07-203-3/+3
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* [tx-robot] updated from transifexNextcloud bot2020-07-192-2/+2
|
* [tx-robot] updated from transifexNextcloud bot2020-07-072-4/+4
|
* [tx-robot] updated from transifexNextcloud bot2020-07-032-0/+4
|
* Also always return in app commandsJoas Schilling2020-06-263-6/+11
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2020-06-092-18/+18
|
* [tx-robot] updated from transifexNextcloud bot2020-06-012-0/+6
|
* [tx-robot] updated from transifexNextcloud bot2020-05-222-0/+10
|
* [tx-robot] updated from transifexNextcloud bot2020-05-102-12/+12
|
* Bump app versions and requirementsJoas Schilling2020-05-071-2/+2
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Update license headers for 19Christoph Wurst2020-04-2914-0/+14
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* [tx-robot] updated from transifexNextcloud bot2020-04-252-4/+4
|
* [tx-robot] updated from transifexNextcloud bot2020-04-212-4/+4
|
* [tx-robot] updated from transifexNextcloud bot2020-04-162-2/+2
|
* [tx-robot] updated from transifexNextcloud bot2020-04-132-2/+2
|
* Format code according to PSR2Christoph Wurst2020-04-101-1/+1
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Add visibility to all constantsChristoph Wurst2020-04-103-10/+10
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Add visibility to all methods and position of static keywordChristoph Wurst2020-04-101-1/+1
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Format control structures, classes, methods and functionChristoph Wurst2020-04-1039-165/+40
| | | | | | | | | | | | | | | To continue this formatting madness, here's a tiny patch that adds unified formatting for control structures like if and loops as well as classes, their methods and anonymous functions. This basically forces the constructs to start on the same line. This is not exactly what PSR2 wants, but I think we can have a few exceptions with "our" style. The starting of braces on the same line is pracrically standard for our code. This also removes and empty lines from method/function bodies at the beginning and end. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Use elseif instead of else ifChristoph Wurst2020-04-104-4/+4
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Remove trailing and in between spacesChristoph Wurst2020-04-094-19/+19
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Remove spaces after method or function callChristoph Wurst2020-04-093-5/+5
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Unify function spacing to PSR2 recommendationChristoph Wurst2020-04-097-13/+13
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Use exactly one empty line after the namespace declarationChristoph Wurst2020-04-0930-30/+0
| | | | | | For PSR2 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Fix (array) indent style to always use one tabChristoph Wurst2020-04-092-3/+3
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Update the license headers for Nextcloud 19Christoph Wurst2020-03-3114-0/+14
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* [tx-robot] updated from transifexNextcloud bot2020-03-292-12/+12
|
* Merge pull request #20170 from nextcloud/techdebt/remove-unused-importsChristoph Wurst2020-03-272-7/+0
|\ | | | | Remove unused imports
| * Remove unused importsChristoph Wurst2020-03-252-7/+0
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Use the short array syntax, everywhereChristoph Wurst2020-03-269-78/+78
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Use the shorter phpunit syntax for mocked return valuesChristoph Wurst2020-03-258-20/+20
|/ | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Update autoloaders for composer v1.10.1Christoph Wurst2020-03-191-0/+3
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>