Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

aef6ecdb

Commit aef6ecdb authored 10 years ago by Vincent Petry

Downloads
- Plain Diff

Merge pull request #15616 from owncloud/enc_stream_copy

always create a new instance of the encryption module

parents f32d9775 7d4b1b52

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

apps/encryption/appinfo/application.php 11 additions, 7 deletions

apps/encryption/appinfo/application.php
apps/encryption/lib/crypto/encryption.php 2 additions, 1 deletion

apps/encryption/lib/crypto/encryption.php
lib/private/encryption/manager.php 19 additions, 23 deletions

lib/private/encryption/manager.php
lib/public/encryption/imanager.php 8 additions, 6 deletions

lib/public/encryption/imanager.php
settings/admin.php 4 additions, 4 deletions

settings/admin.php
tests/lib/encryption/managertest.php 22 additions, 19 deletions

tests/lib/encryption/managertest.php

with 66 additions and 60 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