Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Nextcloud
- Activity
- Members
- Labels
- Service Desk
- Model experiments

Snippets Groups Projects

678b7d7e

Commit 678b7d7e authored 9 years ago by Thomas Müller

Downloads
- Plain Diff

Merge pull request #15860 from owncloud/enc_fallback_old_encryption

[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)

parents 93c25a1f 27683f94

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

apps/encryption/lib/crypto/crypt.php 9 additions, 0 deletions

apps/encryption/lib/crypto/crypt.php
apps/encryption/lib/crypto/encryption.php 11 additions, 3 deletions

apps/encryption/lib/crypto/encryption.php
apps/encryption/tests/lib/crypto/encryptionTest.php 27 additions, 0 deletions

apps/encryption/tests/lib/crypto/encryptionTest.php
apps/encryption_dummy/lib/dummymodule.php 2 additions, 1 deletion

apps/encryption_dummy/lib/dummymodule.php
lib/private/files/storage/wrapper/encryption.php 20 additions, 6 deletions

lib/private/files/storage/wrapper/encryption.php
lib/private/files/stream/encryption.php 16 additions, 8 deletions

lib/private/files/stream/encryption.php
lib/public/encryption/iencryptionmodule.php 2 additions, 1 deletion

lib/public/encryption/iencryptionmodule.php
tests/lib/files/stream/encryption.php 1 addition, 1 deletion

tests/lib/files/stream/encryption.php

with 88 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment