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 |
|
Thomas Müller
|
d203296e35
|
only encrypt files and files_versions
|
2015-04-07 13:30:30 +02:00 |
|
Thomas Müller
|
035646c0f6
|
fix exception handling
|
2015-04-07 13:30:30 +02:00 |
|
Bjoern Schiessle
|
1358d07d35
|
let user enable recovery key
|
2015-04-07 13:30:29 +02:00 |
|
Thomas Müller
|
dbdd754c3f
|
Further cleanup of files_encryption
|
2015-04-07 13:30:28 +02:00 |
|
Bjoern Schiessle
|
2331298380
|
fix parameter declaration and class initialisation
|
2015-04-07 13:30:28 +02:00 |
|
Bjoern Schiessle
|
c64e0af4fb
|
check if recovery key exists and encrypt the file with the recovery key if needed
|
2015-04-07 13:30:28 +02:00 |
|
Bjoern Schiessle
|
24c6604388
|
add public link share key to file if it was shared as public link
|
2015-04-07 13:30:28 +02:00 |
|
Bjoern Schiessle
|
37e8268447
|
make sharing and unsharing work
|
2015-04-07 13:30:27 +02:00 |
Clark Tomlinson
|
d15c2e52b0
|
cleanup and removing cachefactory
|
2015-04-07 13:30:27 +02:00 |
|
Bjoern Schiessle
|
2e00acda07
|
read encrypted files
|
2015-04-07 13:30:27 +02:00 |
|
Bjoern Schiessle
|
6c9251d9f8
|
make sure that all file keys are written to the key storage
|
2015-04-07 13:30:27 +02:00 |
|
Bjoern Schiessle
|
198b73fe32
|
write encrypted file to disc
|
2015-04-07 13:30:27 +02:00 |
|
Bjoern Schiessle
|
c00e728e5f
|
encryption app: remove legacy code, we do only server-side encryption
|
2015-04-07 13:30:27 +02:00 |
|
Thomas Müller
|
ecb3834554
|
fixing obvious bugs while testing
|
2015-04-07 13:30:27 +02:00 |
|
Clark Tomlinson
|
0c2f9ca849
|
Updating keystorage movement and fixing hooks
|
2015-04-07 13:30:27 +02:00 |
|
Clark Tomlinson
|
39733c8da1
|
Initial commit
|
2015-04-07 13:30:27 +02:00 |