Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update license headers and authors | Morris Jobke | 2015-06-25 | 1 | -1/+3 |
| | |||||
* | flush() comments + perf opt | jknockaert | 2015-05-26 | 1 | -5/+7 |
| | |||||
* | fix calculation of $count, $count is always 8129 so we need to check this | jknockaert | 2015-05-21 | 1 | -1/+1 |
| | | | | against the unencrypted file size | ||||
* | test to simulate a non-seekable stream wrapper | Bjoern Schiessle | 2015-05-21 | 1 | -6/+18 |
| | |||||
* | encrypted filesize calculation in flush() | jknockaert | 2015-05-21 | 1 | -1/+8 |
| | |||||
* | fix #16356 | jknockaert | 2015-05-18 | 1 | -1/+1 |
| | |||||
* | fix #15973 | jknockaert | 2015-04-30 | 1 | -9/+7 |
| | | | Rework of stream_seek handling; there where basically two bugs: 1. seeking to the end of the current file would fail (with SEEK_SET); and 2. if seeking to an undefined position (outside 0,unencryptedSize) then newPosition was not defined. I used the opportunity to simplify the code. | ||||
* | fall back to the ownCloud default encryption module and aes128 if we read a ↵ | Bjoern Schiessle | 2015-04-27 | 1 | -8/+16 |
| | | | | encrypted file without a header | ||||
* | fix unit tests | Bjoern Schiessle | 2015-04-24 | 1 | -4/+10 |
| | |||||
* | Update encryption.php | jknockaert | 2015-04-24 | 1 | -1/+2 |
| | |||||
* | fixed name | jknockaert | 2015-04-24 | 1 | -1/+1 |
| | |||||
* | Update encryption.php | jknockaert | 2015-04-24 | 1 | -8/+8 |
| | |||||
* | fix encryption header error | jknockaert | 2015-04-24 | 1 | -13/+16 |
| | | | When moving back the pointer to position 0 (using stream_seek), the pointer on the encrypted stream will be moved to the position immediately after the header. Reading the header again (invoked by stream_read) will cause an error, writing the header again (invoked by stream_write) will corrupt the file. Reading/writing the header should therefore happen when opening the file rather than upon read or write. Note that a side-effect of this PR is that empty files will still get an encryption header; I think that is OK, but it is different from how it was originally implemented. | ||||
* | Merge pull request #15757 from owncloud/enc-fixfeofforlastblock | Björn Schießle | 2015-04-22 | 1 | -0/+4 |
|\ | | | | | Fix encryption feof to not return too early | ||||
| * | Fix encryption feof to not return too early | Vincent Petry | 2015-04-20 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | This is because stream_read will pre-cache the next block which causes feof($this->source) to return true prematurely. So we cannot rely on it. Fixed encryption stream wrapper unit tests to actually simulate 6k/8k blocks to make sure we cover the matching logic. Added two data files with 8192 and 8193 bytes. | ||||
* | | get dirname from sharePath | Bjoern Schiessle | 2015-04-21 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #15636 from owncloud/enc2_performance_improvement | Björn Schießle | 2015-04-21 | 1 | -3/+2 |
|\ \ | |/ |/| | [encryption2] set size and unencrypted size to zero at the beginning of a write operation | ||||
| * | set size and unencrypted size to zero on fopen | Bjoern Schiessle | 2015-04-20 | 1 | -3/+2 |
| | | |||||
* | | if we start writing a file from the beginning, size should start by zero; ↵ | Bjoern Schiessle | 2015-04-16 | 1 | -2/+2 |
|/ | | | | result of floor needs to be casted to int in order to compare it with ->size | ||||
* | fixing license headers - encryption code related | Thomas Müller | 2015-04-07 | 1 | -14/+14 |
| | |||||
* | comment change as it broke unit tests | Thomas Müller | 2015-04-07 | 1 | -1/+1 |
| | |||||
* | Adjusting count on read | jknockaert | 2015-04-07 | 1 | -1/+2 |
| | |||||
* | Fixing encryption stream wrapper seek - thanks @jknockaert | jknockaert | 2015-04-07 | 1 | -0/+3 |
| | |||||
* | fixing unit tests for stream wrapper | Thomas Müller | 2015-04-07 | 1 | -1/+1 |
| | |||||
* | Finally fixing encryption with public share | Thomas Müller | 2015-04-07 | 1 | -1/+1 |
| | |||||
* | add helper class accessible for encryption modules to ask for a list of ↵ | Bjoern Schiessle | 2015-04-07 | 1 | -1/+8 |
| | | | | users with access to a file, needed to apply the recovery key to all files | ||||
* | remove unencrypted_size from the cache, size will contain the unencrypted size | Bjoern Schiessle | 2015-04-07 | 1 | -1/+2 |
| | |||||
* | initializing some variables + update size after writing the headers | Thomas Müller | 2015-04-07 | 1 | -3/+3 |
| | |||||
* | https://github.com/owncloud/core/pull/15305#discussion_r27382305 | Thomas Müller | 2015-04-07 | 1 | -0/+2 |
| | | | | | Conflicts: lib/private/files/stream/encryption.php | ||||
* | initializing some variables | Thomas Müller | 2015-04-07 | 1 | -0/+1 |
| | |||||
* | call end() before closing the file | Bjoern Schiessle | 2015-04-07 | 1 | -1/+7 |
| | |||||
* | adding unit tests for stream wrapper | Thomas Müller | 2015-04-07 | 1 | -13/+18 |
| | |||||
* | Applying diff as of https://github.com/owncloud/core/pull/15303 | jknockaert | 2015-04-07 | 1 | -24/+46 |
| | |||||
* | Merge pull request #15234 from owncloud/encryption2_core | Thomas Müller | 2015-03-26 | 1 | -0/+385 |
|\ | | | | | core part of encryption 2.0 | ||||
| * | implement basic encryption functionallity in core to enable multiple ↵ | Bjoern Schiessle | 2015-03-26 | 1 | -0/+385 |
| | | | | | | | | encryption modules | ||||
* | | Update license headers | Jenkins for ownCloud | 2015-03-26 | 5 | -20/+96 |
|/ | |||||
* | Revert "Updating license headers" | Morris Jobke | 2015-02-26 | 5 | -91/+25 |
| | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36. | ||||
* | Updating license headers | Jenkins for ownCloud | 2015-02-23 | 5 | -25/+91 |
| | |||||
* | in quota wrapper use === instead of ! for better readability and as in other ↵ | Jörn Friedrich Dreyer | 2014-09-22 | 1 | -1/+1 |
| | | | | wrappers | ||||
* | return boolean in Ciose::stream_seek | Jörn Friedrich Dreyer | 2014-09-22 | 1 | -1/+1 |
| | |||||
* | return boolean in OC::stream_seek | Jörn Friedrich Dreyer | 2014-09-22 | 1 | -1/+1 |
| | |||||
* | Fixed quota wrapper to return the value from flock() | Vincent Petry | 2014-06-04 | 1 | -1/+1 |
| | |||||
* | More PHPDoc for file functions | Robin McCorkell | 2014-05-13 | 1 | -0/+8 |
| | |||||
* | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 2 | -0/+6 |
| | |||||
* | Added comment for clarification about fseek() call in quota.php | Vincent Petry | 2013-10-25 | 1 | -0/+2 |
| | |||||
* | Fixed quota stream's fseek method | Vincent Petry | 2013-10-25 | 1 | -2/+12 |
| | | | | | | - Added missing return statement - Added missing support for SEEK_END - Fixes #5524 | ||||
* | move the private namespace OC into lib/private - OCP will stay in lib/public | Thomas Müller | 2013-09-30 | 5 | -0/+560 |
Conflicts: lib/private/vcategories.php |