Commit graph

66 commits

Author SHA1 Message Date
Thomas Müller
eebe2b9c23 User IUser::getEMailAddress() all over the place 2015-12-02 21:25:05 +01:00
Scrutinizer Auto-Fixer
be4c3a8b56 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-11-27 15:32:44 +00:00
Bjoern Schiessle
5fad45b230 make encryption configurable for home storage 2015-10-27 14:24:20 +01:00
Lukas Reschke
8f09d5b67c Update license headers 2015-10-26 14:04:01 +01:00
Joas Schilling
e0a56317fa Fix "Call to a member function getUID() on boolean" in Crypt 2015-10-22 11:46:37 +02:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Bjoern Schiessle
bf82015254 add some output to explain the pre-conditions for decrypt-all 2015-10-05 12:41:05 +02:00
Bjoern Schiessle
90f1e3dc94 no need to list users if all users already had a key-pair 2015-09-24 12:47:46 +02:00
Bjoern Schiessle
daf5d1ff2e fix small typo 2015-09-21 16:48:15 +02:00
Bjoern Schiessle
9bd4f2d41e occ script to disable encryption and to decrypt all files again 2015-09-15 22:39:44 +02:00
Lukas Reschke
7953cc9494 Function does return void
This function does return void and not a bool.
2015-09-15 14:02:10 +02:00
Bjoern Schiessle
acfc7d7c4d enable usage of a master key 2015-09-07 16:08:41 +02:00
Bjoern Schiessle
166e57cf61 return false if private key is not valid 2015-08-30 15:31:19 +02:00
Björn Schießle
6e210d960c Merge pull request #18423 from owncloud/occ_encrypt_all
occ command line tool to encrypt all files
2015-08-28 20:44:55 +02:00
Bjoern Schiessle
8c08dd0ac2 occ tool to encrypt all files 2015-08-26 14:58:22 +02:00
Bjoern Schiessle
854fd63ea9 use uid as additional information for salt 2015-08-07 15:51:43 +02:00
Bjoern Schiessle
62bc0e5264 use password hash instead of the plain password to encrypt the private key 2015-08-07 15:21:08 +02:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Bjoern Schiessle
d743d6d356 add hint to exception 2015-06-08 21:16:23 +02:00
Bjoern Schiessle
5549641f1f improve error messages displayed to the user 2015-05-27 21:00:02 +02:00
Thomas Müller
d90b83725f Merge pull request #16085 from owncloud/encryption-module-rename
rename to 'Default encryption module'
2015-05-19 11:13:33 +02:00
Joas Schilling
30d165ebf2 Add missing import for the exception 2015-05-18 15:45:47 +02:00
Bjoern Schiessle
7676166254 add l10n to constructor 2015-05-18 15:43:53 +02:00
Vincent Petry
86cf8e1f68 Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash
also encrypt files in trash bin
2015-05-18 14:59:34 +02:00
Bjoern Schiessle
7d492fefae also encrypt files in trash bin 2015-05-18 12:51:47 +02:00
Bjoern Schiessle
887be709f5 a new approach to display the error message 2015-05-18 10:15:17 +02:00
Jan-Christoph Borchardt
35292eb66c rename to 'Default encryption module' 2015-05-06 15:31:05 +02:00
Björn Schießle
2ce01ee0bf Merge pull request #15938 from owncloud/enc_update_recovery_share_key
[encryption] check recovery key setting for the correct user
2015-05-05 10:48:09 +02:00
Joas Schilling
4a6808a0f4 Simplify the test 2015-04-30 12:04:02 +02:00
Bjoern Schiessle
4ef9df8750 skip user if we don't have a public key 2015-04-30 12:04:02 +02:00
Bjoern Schiessle
70a44621be check recovery setting for the right user 2015-04-30 11:38:53 +02:00
Bjoern Schiessle
29bcfb2fdb method shouldn't be static 2015-04-28 20:21:53 +02:00
Bjoern Schiessle
d5cbb66b66 also create encryption keys for empty files 2015-04-28 20:21:53 +02:00
Bjoern Schiessle
df428b76ac skip update of encryption keys if file is not encrypted 2015-04-28 20:21:53 +02:00
Bjoern Schiessle
27683f9442 fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header 2015-04-27 13:01:18 +02:00
Bjoern Schiessle
7d4b1b52d0 always create a new instance of the encryption module 2015-04-17 10:31:33 +02:00
Bjoern Schiessle
959665003b decrypt private key for public shares correctly 2015-04-16 14:15:04 +02:00
Thomas Müller
cbe30f740e remove calculateUnencryptedSize() - not needed 2015-04-14 13:08:59 +02:00
Thomas Müller
f816acde27 fix reading of private key 2015-04-14 12:23:25 +02:00
Bjoern Schiessle
d1fa3c6b32 add unit test for crypt.php 2015-04-10 15:12:57 +02:00
Lukas Reschke
ec69f2838c Fix typos and some other adjustments 2015-04-09 14:09:09 +02:00
Lukas Reschke
4ca6419475 Fix PHPDoc 2015-04-09 10:54:53 +02:00
Bjoern Schiessle
4ce5669419 read cipher from key header and always write a key header if a new private key is stored 2015-04-08 14:26:00 +02:00
Bjoern Schiessle
215a9bcbc3 fix function call 2015-04-08 09:32:55 +02:00
Thomas Müller
a4483243ac fixing license headers - encryption code related 2015-04-07 17:02:49 +02:00
Thomas Müller
111fbabfb4 PHPDoc cleanup - clean code \o/ 2015-04-07 13:30:31 +02:00
Bjoern Schiessle
e8fa3a2370 fix versions download and previews 2015-04-07 13:30:31 +02:00
Thomas Müller
664b2bb7af cleaning up exception mess 2015-04-07 13:30:30 +02:00
Thomas Müller
feb9a6e216 Set human readable module ids 2015-04-07 13:30:30 +02:00
Thomas Müller
43c0af2580 Fix shouldEncrypt and don't throw exception id fileKey not present - can happen 2015-04-07 13:30:30 +02:00