4 Commits

Author	SHA1	Message	Date
Vincent Petry	b50d3255fb	Merge pull request #22791 from owncloud/enc_master_key_improvements ... Enc master key improvements	2016-04-21 11:48:26 +02:00
Bjoern Schiessle	93ed965cbb	fix creation of versions of encrypted files on external storages ... in order to create a 1:1 copy of a file if a version gets created we need to store this information on copyBetweenStorage(). This allows us to by-pass the encryption wrapper if we read the source file.	2016-03-31 19:24:47 +02:00
Bjoern Schiessle	5e267589d4	only create and update user specific key if no master key is enabled	2016-03-18 11:06:14 +01:00
Robin Appelman	a3d734f6cd	Add trait to enable encryption for a unit test	2015-09-18 11:55:15 +02:00