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

c221e827

Commit c221e827 authored 11 years ago by Vincent Petry

Downloads
- Plain Diff

Merge pull request #5959 from owncloud/encryption_check_if_file_is_encrypted

only check if the key file exists to decide if it is an encrypted file or not

parents 30b8f4ec b4e7258a

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

apps/files_encryption/lib/keymanager.php 1 addition, 2 deletions

apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php 1 addition, 1 deletion

apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php 11 additions, 14 deletions

apps/files_encryption/lib/util.php
apps/files_encryption/tests/crypt.php 7 additions, 7 deletions

apps/files_encryption/tests/crypt.php

with 20 additions and 24 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