[Pkg-owncloud-commits] [owncloud] 21/165: Merge pull request #15445 from owncloud/enc2_migration

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 1174ad0681bb82252a26b5ee44d5b2990171932b
Merge: c7e5e30 9596650
Author: Clark Tomlinson <fallen013 at gmail.com>
Date:   Thu Apr 16 09:34:47 2015 -0400

    Merge pull request #15445 from owncloud/enc2_migration
    
    add migration script from old encryption to new one

 apps/encryption/appinfo/app.php                  |   8 +-
 apps/encryption/appinfo/application.php          |  13 +-
 apps/encryption/appinfo/info.xml                 |   2 +-
 apps/encryption/appinfo/register_command.php     |  15 +
 apps/encryption/appinfo/version                  |   1 +
 apps/encryption/command/migratekeys.php          | 105 +++++++
 apps/encryption/hooks/userhooks.php              |   1 -
 apps/encryption/lib/crypto/crypt.php             |   4 +-
 apps/encryption/lib/keymanager.php               |   2 +-
 apps/encryption/lib/migration.php                | 319 ++++++++++++++++++++
 apps/encryption/tests/lib/KeyManagerTest.php     |   2 +-
 apps/encryption/tests/lib/MigrationTest.php      | 356 +++++++++++++++++++++++
 lib/base.php                                     |   1 +
 lib/private/encryption/keys/storage.php          |   6 +-
 lib/private/encryption/manager.php               |  46 ++-
 lib/private/encryption/util.php                  |  47 ++-
 lib/private/files/storage/wrapper/encryption.php |  11 +-
 lib/private/files/stream/encryption.php          |   4 +-
 lib/private/server.php                           |  16 +-
 settings/admin.php                               |   5 +
 settings/application.php                         |  16 +
 settings/controller/encryptioncontroller.php     | 122 ++++++++
 settings/js/admin.js                             |  22 +-
 settings/routes.php                              |   1 +
 settings/templates/admin.php                     |  57 ++--
 tests/lib/encryption/managertest.php             |  95 +++---
 tests/lib/encryption/utiltest.php                |  35 ++-
 tests/lib/files/storage/wrapper/encryption.php   |   5 +-
 tests/lib/files/stream/encryption.php            |   5 +-
 29 files changed, 1204 insertions(+), 118 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git