summaryrefslogtreecommitdiffstats
path: root/apps/encryption/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16085 from owncloud/encryption-module-renameThomas Müller2015-05-191-2/+2
|\
| * rename to 'Default encryption module'Jan-Christoph Borchardt2015-05-061-2/+2
* | Add missing import for the exceptionJoas Schilling2015-05-181-0/+2
* | add l10n to constructorBjoern Schiessle2015-05-181-2/+8
* | Merge pull request #16404 from owncloud/enc_encrypt_files_in_trashVincent Petry2015-05-181-1/+4
|\ \
| * | also encrypt files in trash binBjoern Schiessle2015-05-181-1/+4
* | | a new approach to display the error messageBjoern Schiessle2015-05-182-1/+70
|/ /
* / delete all file keys doesn't need the encryption module as parameter; impleme...Bjoern Schiessle2015-05-131-1/+1
|/
* Merge pull request #15938 from owncloud/enc_update_recovery_share_keyBjörn Schießle2015-05-054-40/+28
|\
| * check recovery setting for the right userBjoern Schiessle2015-04-304-40/+28
* | Simplify the testJoas Schilling2015-04-301-2/+4
* | skip user if we don't have a public keyBjoern Schiessle2015-04-301-1/+15
|/
* Merge pull request #15919 from owncloud/enc_handle_empty_filesClark Tomlinson2015-04-292-26/+50
|\
| * method shouldn't be staticBjoern Schiessle2015-04-281-1/+1
| * also create encryption keys for empty filesBjoern Schiessle2015-04-281-15/+20
| * skip update of encryption keys if file is not encryptedBjoern Schiessle2015-04-281-10/+29
* | Merge pull request #15706 from owncloud/fix-15705-masterLukas Reschke2015-04-292-3/+6
|\ \ | |/ |/|
| * move creation of shared key to the login handler - fixes #15705Thomas Müller2015-04-172-3/+6
* | fall back to the ownCloud default encryption module and aes128 if we read a e...Bjoern Schiessle2015-04-272-3/+20
* | add $encryptionModuleId to methods of Keys/IStorageThomas Müller2015-04-221-21/+33
|/
* always create a new instance of the encryption moduleBjoern Schiessle2015-04-171-1/+2
* Merge pull request #15675 from owncloud/enc_error_messagesClark Tomlinson2015-04-161-3/+9
|\
| * display warning if password changed or if the keys are not initializedBjoern Schiessle2015-04-161-3/+9
* | Merge pull request #15445 from owncloud/enc2_migrationClark Tomlinson2015-04-163-3/+322
|\ \ | |/ |/|
| * decrypt private key for public shares correctlyBjoern Schiessle2015-04-162-3/+3
| * add migration script from old encryption to new oneBjoern Schiessle2015-04-161-0/+319
* | make sure that encrypted private keys always have a headerBjoern Schiessle2015-04-152-2/+4
|/
* remove calculateUnencryptedSize() - not neededThomas Müller2015-04-141-10/+0
* fix reading of private keyThomas Müller2015-04-141-1/+1
* add unit test for crypt.phpBjoern Schiessle2015-04-101-29/+20
* Fix typos and some other adjustmentsLukas Reschke2015-04-092-6/+9
* Fix PHPDocLukas Reschke2015-04-094-8/+19
* read cipher from key header and always write a key header if a new private ke...Bjoern Schiessle2015-04-083-9/+29
* fix function callBjoern Schiessle2015-04-081-2/+1
* fixing license headers - encryption code relatedThomas Müller2015-04-0712-38/+144
* PHPDoc cleanup - clean code \o/Thomas Müller2015-04-071-19/+18
* fix versions download and previewsBjoern Schiessle2015-04-071-3/+15
* fixing unit test executionThomas Müller2015-04-071-1/+0
* add more descriptive message to the exception, will be displayed to the userBjoern Schiessle2015-04-071-1/+1
* cleaning up exception messThomas Müller2015-04-077-10/+44
* Set human readable module idsThomas Müller2015-04-071-1/+1
* Fix shouldEncrypt and don't throw exception id fileKey not present - can happenThomas Müller2015-04-073-54/+25
* make recovery key workBjoern Schiessle2015-04-072-48/+61
* Finally fixing encryption with public shareThomas Müller2015-04-071-27/+31
* only encrypt files and files_versionsThomas Müller2015-04-071-1/+13
* fix exception handlingThomas Müller2015-04-074-38/+48
* fix hook registrationBjoern Schiessle2015-04-071-1/+2
* remove useless setup base classClark Tomlinson2015-04-072-40/+11
* adding hook manager testClark Tomlinson2015-04-071-1/+0
* cleanup keymanager test and add some additional testsBjoern Schiessle2015-04-072-4/+7