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

98bc1ad7

Commit 98bc1ad7 authored 10 years ago by Thomas Müller

Downloads
- Plain Diff

Merge pull request #15265 from owncloud/enc2_fixes

core improvements for Encryption 2.0

parents e918bcf2 b5fad75e

Branches

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

lib/private/encryption/update.php 1 addition, 1 deletion

lib/private/encryption/update.php
lib/private/encryption/util.php 16 additions, 3 deletions

lib/private/encryption/util.php
lib/private/files/storage/wrapper/encryption.php 1 addition, 1 deletion

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

lib/public/encryption/iencryptionmodule.php
lib/public/encryption/keys/istorage.php 8 additions, 0 deletions

lib/public/encryption/keys/istorage.php
tests/lib/encryption/utiltest.php 35 additions, 0 deletions

tests/lib/encryption/utiltest.php

with 63 additions and 6 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