Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15938 from owncloud/enc_update_recovery_share_key | Björn Schießle | 2015-05-05 | 4 | -40/+28 |
|\ | | | | | [encryption] check recovery key setting for the correct user | ||||
| * | check recovery setting for the right user | Bjoern Schiessle | 2015-04-30 | 4 | -40/+28 |
| | | |||||
* | | Simplify the test | Joas Schilling | 2015-04-30 | 1 | -2/+4 |
| | | |||||
* | | skip user if we don't have a public key | Bjoern Schiessle | 2015-04-30 | 1 | -1/+15 |
|/ | |||||
* | Merge pull request #15919 from owncloud/enc_handle_empty_files | Clark Tomlinson | 2015-04-29 | 2 | -26/+50 |
|\ | | | | | Encryption improve handling of empty and unencrypted files | ||||
| * | method shouldn't be static | Bjoern Schiessle | 2015-04-28 | 1 | -1/+1 |
| | | |||||
| * | also create encryption keys for empty files | Bjoern Schiessle | 2015-04-28 | 1 | -15/+20 |
| | | |||||
| * | skip update of encryption keys if file is not encrypted | Bjoern Schiessle | 2015-04-28 | 1 | -10/+29 |
| | | |||||
* | | Merge pull request #15706 from owncloud/fix-15705-master | Lukas Reschke | 2015-04-29 | 2 | -3/+6 |
|\ \ | |/ |/| | move creation of shared key to the login handler | ||||
| * | move creation of shared key to the login handler - fixes #15705 | Thomas Müller | 2015-04-17 | 2 | -3/+6 |
| | | |||||
* | | fall back to the ownCloud default encryption module and aes128 if we read a ↵ | Bjoern Schiessle | 2015-04-27 | 2 | -3/+20 |
| | | | | | | | | encrypted file without a header | ||||
* | | add $encryptionModuleId to methods of Keys/IStorage | Thomas Müller | 2015-04-22 | 1 | -21/+33 |
|/ | |||||
* | always create a new instance of the encryption module | Bjoern Schiessle | 2015-04-17 | 1 | -1/+2 |
| | |||||
* | Merge pull request #15675 from owncloud/enc_error_messages | Clark Tomlinson | 2015-04-16 | 1 | -3/+9 |
|\ | | | | | [encryption] display warning if password changed or if the keys are not initialized | ||||
| * | display warning if password changed or if the keys are not initialized | Bjoern Schiessle | 2015-04-16 | 1 | -3/+9 |
| | | |||||
* | | Merge pull request #15445 from owncloud/enc2_migration | Clark Tomlinson | 2015-04-16 | 3 | -3/+322 |
|\ \ | |/ |/| | add migration script from old encryption to new one | ||||
| * | decrypt private key for public shares correctly | Bjoern Schiessle | 2015-04-16 | 2 | -3/+3 |
| | | |||||
| * | add migration script from old encryption to new one | Bjoern Schiessle | 2015-04-16 | 1 | -0/+319 |
| | | |||||
* | | make sure that encrypted private keys always have a header | Bjoern Schiessle | 2015-04-15 | 2 | -2/+4 |
|/ | |||||
* | remove calculateUnencryptedSize() - not needed | Thomas Müller | 2015-04-14 | 1 | -10/+0 |
| | |||||
* | fix reading of private key | Thomas Müller | 2015-04-14 | 1 | -1/+1 |
| | |||||
* | add unit test for crypt.php | Bjoern Schiessle | 2015-04-10 | 1 | -29/+20 |
| | |||||
* | Fix typos and some other adjustments | Lukas Reschke | 2015-04-09 | 2 | -6/+9 |
| | |||||
* | Fix PHPDoc | Lukas Reschke | 2015-04-09 | 4 | -8/+19 |
| | |||||
* | read cipher from key header and always write a key header if a new private ↵ | Bjoern Schiessle | 2015-04-08 | 3 | -9/+29 |
| | | | | key is stored | ||||
* | fix function call | Bjoern Schiessle | 2015-04-08 | 1 | -2/+1 |
| | |||||
* | fixing license headers - encryption code related | Thomas Müller | 2015-04-07 | 12 | -38/+144 |
| | |||||
* | PHPDoc cleanup - clean code \o/ | Thomas Müller | 2015-04-07 | 1 | -19/+18 |
| | |||||
* | fix versions download and previews | Bjoern Schiessle | 2015-04-07 | 1 | -3/+15 |
| | |||||
* | fixing unit test execution | Thomas Müller | 2015-04-07 | 1 | -1/+0 |
| | |||||
* | add more descriptive message to the exception, will be displayed to the user | Bjoern Schiessle | 2015-04-07 | 1 | -1/+1 |
| | |||||
* | cleaning up exception mess | Thomas Müller | 2015-04-07 | 7 | -10/+44 |
| | |||||
* | Set human readable module ids | Thomas Müller | 2015-04-07 | 1 | -1/+1 |
| | |||||
* | Fix shouldEncrypt and don't throw exception id fileKey not present - can happen | Thomas Müller | 2015-04-07 | 3 | -54/+25 |
| | |||||
* | make recovery key work | Bjoern Schiessle | 2015-04-07 | 2 | -48/+61 |
| | |||||
* | Finally fixing encryption with public share | Thomas Müller | 2015-04-07 | 1 | -27/+31 |
| | |||||
* | only encrypt files and files_versions | Thomas Müller | 2015-04-07 | 1 | -1/+13 |
| | |||||
* | fix exception handling | Thomas Müller | 2015-04-07 | 4 | -38/+48 |
| | |||||
* | fix hook registration | Bjoern Schiessle | 2015-04-07 | 1 | -1/+2 |
| | |||||
* | remove useless setup base class | Clark Tomlinson | 2015-04-07 | 2 | -40/+11 |
| | |||||
* | adding hook manager test | Clark Tomlinson | 2015-04-07 | 1 | -1/+0 |
| | |||||
* | cleanup keymanager test and add some additional tests | Bjoern Schiessle | 2015-04-07 | 2 | -4/+7 |
| | |||||
* | delete recovery keys on disable | Bjoern Schiessle | 2015-04-07 | 2 | -11/+18 |
| | |||||
* | fixing test helper and undoing fubar in class... | Clark Tomlinson | 2015-04-07 | 1 | -4/+3 |
| | |||||
* | :100:% coverage for session class | Clark Tomlinson | 2015-04-07 | 1 | -4/+5 |
| | |||||
* | let user enable recovery key | Bjoern Schiessle | 2015-04-07 | 4 | -33/+45 |
| | |||||
* | add helper class accessible for encryption modules to ask for a list of ↵ | Bjoern Schiessle | 2015-04-07 | 1 | -14/+73 |
| | | | | users with access to a file, needed to apply the recovery key to all files | ||||
* | fix set recovery key and implement change password | Bjoern Schiessle | 2015-04-07 | 3 | -16/+61 |
| | |||||
* | use password change logic to userhooks to avoid recursions | Bjoern Schiessle | 2015-04-07 | 2 | -73/+13 |
| | |||||
* | add session class to handle all session operations | Bjoern Schiessle | 2015-04-07 | 3 | -18/+141 |
| |