Bjoern Schiessle
e5c84488ff
Merge branch 'files_encryption' of gitorious.org:owncloud/owncloud into files_encryption
...
Conflicts:
apps/files_encryption/lib/keymanager.php
2012-07-26 14:06:39 +02:00
Bjoern Schiessle
bdb406916c
fixed path for filesystem view
2012-07-26 13:49:22 +02:00
Bjoern Schiessle
3ab4ddd1da
function to ask for the encryption mode (server side or client side).
...
Needs to be implemented and integrated into the settings.
2012-07-26 13:47:43 +02:00
Sam Tuke
9f51841c57
Mainly work on implementing new encryption system (+ keyfile handling) into proxy classs
2012-07-25 18:28:56 +01:00
Sam Tuke
adf5c953dd
Fixed use of OCFSV in getPrivateKey()
2012-07-25 16:56:52 +01:00
Sam Tuke
e6de086fb6
Fixed various bugs in hooks class
...
Fixed documentation syntax in keymanager
2012-07-25 16:51:48 +01:00
Sam Tuke
66b461629b
Started implementation of new encyryption classes into the encryption proxy
2012-07-25 16:26:03 +01:00
Bjoern Schiessle
6d1ed388c0
keymanager class for basic operations to store and retrieve keys
2012-07-25 17:01:11 +02:00
Sam Tuke
d766ca8b19
Changed util class methods to use / create public keys in single shared public-keys directory, and group encryption-related user files
2012-07-25 15:33:25 +01:00
Sam Tuke
9368ea73c8
added tests and methods relating to handling of legacy keys
2012-07-25 12:38:40 +01:00
Sam Tuke
9216289856
Wrote new methods for testing if a file is encrypted using AES or Blowfish
...
Added more unit tests for crypt class
Added new method for generating 16 character pseudo-random initialisation vectors
Started writing new methods for handling legacy keys and en/de/re cryption
Added comments to lib/filecache.php explaining expected $path type
2012-07-24 17:57:20 +01:00
Sam Tuke
d294e77721
Development snapshot:
...
- Added methods for sealing data with multiple keys
- Added method for encrypting data, generating iv and keyfile, and returning both
- Added 6 unit test cases (containing 12 tests) for Crypt class
- Commented out old unit tests for now
2012-07-18 18:52:00 +01:00
Sam Tuke
283561823f
Added methods for handling encrypted file + iv content
...
Improved IV generation
2012-07-17 19:15:59 +01:00
Sam Tuke
6af99f3a09
Development snapshot:
...
Rewrote crtpt class as Util, Hooks, and Crypt
Switched blowfish for openssl with AES
Added setup() method for creating user keys and directory structure
Many other changes complete and in progress
2012-07-11 17:51:27 +01:00
Sam Tuke
91da4b05b7
fixed typos
2012-07-10 15:51:57 +01:00
Robin Appelman
252453cd34
fix encryption test cases when not logged in
2012-06-30 01:05:18 +02:00
Robin Appelman
49033ff8e0
dont change the encryption key during the test case
2012-06-21 18:53:10 +02:00
Robin Appelman
6707e4187e
only use 1 fsview when initializing encryption
2012-06-21 18:35:12 +02:00
Robin Appelman
56de98ed8c
fix saved file size for uploaded files
2012-06-21 18:22:18 +02:00
Robin Appelman
d0455c5819
truncate decrypted files based on filelength
2012-06-21 17:38:00 +02:00
Robin Appelman
debd9c8dfb
fix problem with encryption flag not being saved correctly in the filecache
2012-06-18 18:18:10 +02:00
Robin Appelman
195c37f88a
fix for encryption binary files
2012-06-16 01:31:03 +02:00
Robin Appelman
03951ccc6b
fix encryption proxy for updated filecache
2012-06-15 23:11:55 +02:00
Robin Appelman
19bfe21401
add binary test case for encryption
2012-06-15 23:11:33 +02:00
Robin Appelman
f06c08a637
cleanup oc_filecache, splitting it in several parts and using the new hasUpdated
2012-06-15 19:56:15 +02:00
Robin Appelman
601bac746d
use absolute path for file proxies
2012-06-09 17:34:13 +02:00
Sam Tuke
e93bb5135d
Applied fix from kalassico for "Chiper text must be a string" bug ( http://forum.owncloud.org/viewtopic.php?f=3&t=2586&p=5094 )
2012-05-31 12:25:07 +01:00
Frank Karlitschek
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
Frank Karlitschek
8cd7410447
encryption is not yet compatible with ldap
2012-05-22 12:15:51 +02:00
Frank Karlitschek
2f8f7501ef
add warning
2012-05-20 10:58:20 +02:00
Frank Karlitschek
9e73524168
mark the apps as part of the shipped package and increase the requirement to ownCloud 4
2012-05-18 16:06:57 +02:00
Thomas Mueller
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
Robin Appelman
6779f28af4
cache app types during install or update
2012-05-14 22:49:31 +02:00
Robin Appelman
736739bbbd
load remote and public paths from info.xml during upgrade instead of setting them every time
2012-05-11 20:33:56 +02:00
Frank Karlitschek
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
Robin Appelman
70cb053e6b
improve cryptstream fro writing non-chunksized data
2012-05-05 16:49:48 +02:00
Frank Karlitschek
9bcc5c11a8
porting the hooks and starting with the templates
2012-05-05 10:18:45 +02:00
Frank Karlitschek
ff66600bc0
port appconfig
2012-05-02 14:11:29 +02:00
Frank Karlitschek
8c7f854671
move all the files stuff into a files class
2012-05-02 12:54:31 +02:00
Frank Karlitschek
2fe646dcec
ported the oc_app calls
2012-05-02 00:50:26 +02:00
Frank Karlitschek
93b63cf375
ported the rest of the OC_Helper calls
2012-05-02 00:20:45 +02:00
Frank Karlitschek
1a2bbd2ee4
ported addSyript and other small stuff
2012-05-01 20:03:41 +02:00
Frank Karlitschek
254b8b9506
porting of OC_User to public API complete.
...
What better thing to do during a long train ride than refactoring ;-)
2012-05-01 19:04:20 +02:00
Frank Karlitschek
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
Frank Karlitschek
5bf69237b2
ported isLoggedIn
2012-05-01 18:46:15 +02:00
Frank Karlitschek
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
Frank Karlitschek
e8ec999090
port to use the new public api
2012-05-01 09:49:22 +02:00
Robin Appelman
5c3ea14819
fix mimetypes of encrypted files
2012-04-25 00:12:12 +02:00
Robin Appelman
c5b31b001a
add the option to disable file encryption while still being able to decrypt existing files
2012-04-22 21:27:20 +02:00
Robin Appelman
d1ad4dc8d6
add test cases for cryptstream
2012-04-18 20:54:28 +02:00
