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

eb740d1d

Commit eb740d1d authored 9 years ago by Thomas Müller

Downloads
- Plain Diff

Merge pull request #22727 from owncloud/decrypt_all_master_key

make decrypt all work with the master key

parents da18d04b 95ea2ccb

Branches

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

apps/encryption/lib/crypto/decryptall.php 34 additions, 23 deletions

apps/encryption/lib/crypto/decryptall.php
apps/encryption/lib/keymanager.php 1 addition, 1 deletion

apps/encryption/lib/keymanager.php
apps/encryption/tests/lib/crypto/decryptalltest.php 11 additions, 3 deletions

apps/encryption/tests/lib/crypto/decryptalltest.php

with 46 additions and 27 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