Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | enable usage of a master key | Bjoern Schiessle | 2015-09-07 | 4 | -15/+115 | |
| | ||||||
* | return false if private key is not valid | Bjoern Schiessle | 2015-08-30 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #18423 from owncloud/occ_encrypt_all | Björn Schießle | 2015-08-28 | 3 | -0/+445 | |
|\ | | | | | occ command line tool to encrypt all files | |||||
| * | occ tool to encrypt all files | Bjoern Schiessle | 2015-08-26 | 3 | -0/+445 | |
| | | ||||||
* | | Merge pull request #18121 from owncloud/enc_improve_privkey_encryption | Lukas Reschke | 2015-08-24 | 3 | -22/+142 | |
|\ \ | |/ |/| | use password hash to encrypt private key | |||||
| * | use uid as additional information for salt | Bjoern Schiessle | 2015-08-07 | 3 | -13/+13 | |
| | | ||||||
| * | use password hash instead of the plain password to encrypt the private key | Bjoern Schiessle | 2015-08-07 | 3 | -15/+135 | |
| | | ||||||
* | | Remove unnecessary DB prefixes from existing query builder usages | Joas Schilling | 2015-08-10 | 1 | -3/+3 | |
|/ | ||||||
* | only update database on the first run (first run = we have a version number ↵ | Bjoern Schiessle | 2015-07-31 | 1 | -7/+19 | |
| | | | | from the old encryption app) | |||||
* | Fix existing usages by removing the quotes | Joas Schilling | 2015-07-21 | 1 | -7/+7 | |
| | ||||||
* | Use the public interface and our method instead of the doctrine thing | Joas Schilling | 2015-07-21 | 1 | -7/+7 | |
| | ||||||
* | fix mount point detection | Bjoern Schiessle | 2015-07-20 | 1 | -3/+5 | |
| | ||||||
* | don't move keys if the key where already moved in a previous migration run | Bjoern Schiessle | 2015-07-17 | 1 | -14/+60 | |
| | ||||||
* | Merge pull request #17500 from owncloud/encryption_migration_improvements | Thomas Müller | 2015-07-16 | 2 | -5/+22 | |
|\ | | | | | Only clean up if migration finished succesfully | |||||
| * | only create new key pair if both keys are missing | Bjoern Schiessle | 2015-07-08 | 1 | -4/+21 | |
| | | ||||||
| * | only cleanUp the remaining keys if the migration really finished succesfully | Bjoern Schiessle | 2015-07-08 | 1 | -1/+1 | |
| | | ||||||
* | | more secure way to update the database | Bjoern Schiessle | 2015-07-08 | 1 | -14/+24 | |
|/ | ||||||
* | update license headers and authors | Morris Jobke | 2015-06-25 | 8 | -14/+28 | |
| | ||||||
* | remove files_encryption from database at the end of the migration process | Bjoern Schiessle | 2015-06-19 | 1 | -1/+1 | |
| | ||||||
* | add hint to exception | Bjoern Schiessle | 2015-06-08 | 1 | -5/+4 | |
| | ||||||
* | detect migration status | Bjoern Schiessle | 2015-05-27 | 1 | -0/+1 | |
| | ||||||
* | improve error messages displayed to the user | Bjoern Schiessle | 2015-05-27 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #16085 from owncloud/encryption-module-rename | Thomas Müller | 2015-05-19 | 1 | -2/+2 | |
|\ | | | | | rename to 'Default encryption module' | |||||
| * | rename to 'Default encryption module' | Jan-Christoph Borchardt | 2015-05-06 | 1 | -2/+2 | |
| | | ||||||
* | | Add missing import for the exception | Joas Schilling | 2015-05-18 | 1 | -0/+2 | |
| | | ||||||
* | | add l10n to constructor | Bjoern Schiessle | 2015-05-18 | 1 | -2/+8 | |
| | | ||||||
* | | Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash | Vincent Petry | 2015-05-18 | 1 | -1/+4 | |
|\ \ | | | | | | | also encrypt files in trash bin | |||||
| * | | also encrypt files in trash bin | Bjoern Schiessle | 2015-05-18 | 1 | -1/+4 | |
| | | | ||||||
* | | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 2 | -1/+70 | |
|/ / | ||||||
* / | delete all file keys doesn't need the encryption module as parameter; ↵ | Bjoern Schiessle | 2015-05-13 | 1 | -1/+1 | |
|/ | | | | implement rmdir; getFileKeyDir should also work for part files and complete directories | |||||
* | 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 | |
| |