Roeland Jago Douma
8e3e3a4575
Be java compatible and store the tag at the end of the cipher text
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-02 12:39:42 +01:00
Christian Kamm
c743cc171a
Client certs: Improve error message #6128
...
"Could not load certificate" can very well just be a bad password.
2017-11-02 11:30:44 +01:00
Jenkins for ownCloud
7963a8322d
[tx-robot] updated from transifex
2017-11-02 02:18:48 +01:00
Tomaz Canabrava
8d537fdd3c
[CSE] Get Metadata from the server
2017-11-01 18:32:33 +01:00
Tomaz Canabrava
4a66cf11d2
[CSE] Send Metadata to the server
2017-11-01 18:21:30 +01:00
Tomaz Canabrava
2698759525
[CSE] Implement the Folder Unlock api job
2017-11-01 17:54:17 +01:00
Tomaz Canabrava
1b1add5ead
[CSE] Add api to lock file
2017-11-01 17:36:54 +01:00
Christian Kamm
6ac44f05cd
Credentials: Namespace windows cred keys #6125
...
The application name is prepended to the key. QtKeychain doesn't
do that automatically on the platform.
2017-11-01 17:03:30 +01:00
Tomaz Canabrava
e5fdcd2f38
[CSE] Add TODO:
2017-11-01 16:48:19 +01:00
Tomaz Canabrava
ef2529ca44
[CSE] Set padding to 0 for the Rsa encryption
...
Also, commented out the finalization of the decrypt operation
because that was messing with the encryption. There's something
wrong here but I need to get this working and I can fix stuff
later.
2017-11-01 16:13:17 +01:00
Christian Kamm
64a84fda38
Wizard: Don't report confusing error message #6116
...
For historical reasons CheckServerJob doesn't just check url/ but also
url/owncloud/. However, that means if url/status.php is a 404 and
url/owncloud/status.php is a 404, the user will see the latter url
appear in the error message. That's potentially confusing.
Instead, just show the account url which will be closer to what the
user typed into the account wizard, while being adjusted for protocol
and possible redirects.
2017-11-01 15:57:58 +01:00
Tomaz Canabrava
1a891423e5
[CSE] Call the decryption function to test.
2017-11-01 15:48:40 +01:00
Tomaz Canabrava
41ebcd0b7e
[CSE] Decryption of the metadata blob
2017-11-01 15:29:14 +01:00
Tomaz Canabrava
77ec3b086d
[CSE] Remember to finalize encryption
2017-11-01 15:24:19 +01:00
Tomaz Canabrava
88d87bf0ca
[CSE] Convert encrypted bitearray to Base64
...
also, start the decrypt.
2017-11-01 14:46:32 +01:00
Jenkins for ownCloud
8eec79680c
[tx-robot] updated from transifex
2017-11-01 02:19:02 +01:00
Tomaz Canabrava
eb43fa1459
[CSE] Internal metadata encryption working
2017-10-31 17:52:01 +01:00
Tomaz Canabrava
8793fdbc69
[CSE] Remember to actually use the correct variable
2017-10-31 16:06:01 +01:00
Tomaz Canabrava
4bb7ebb6aa
[CSE] Convert the base64 data to raw, for the decyrption
2017-10-31 13:17:22 +01:00
Tomaz Canabrava
3628f3739d
[CSE] Start the decryption of the metadata
2017-10-31 13:06:20 +01:00
Tomaz Canabrava
b28b4705de
[CSE] Correctly store the encrypted metadata
...
Missing the conversion to base64.
2017-10-31 12:07:47 +01:00
Tomaz Canabrava
560ce958de
[CSE] Remove warning.
2017-10-31 11:24:10 +01:00
Tomaz Canabrava
69d73162aa
[CSE] functions for encrypt / decrypt folder
...
The code was scattered around the slot for the context
menu request and had already too many indentation levels.
2017-10-31 11:09:34 +01:00
Tomaz Canabrava
69dc099b17
[CSE] Dedicated function for the subfolder menu
2017-10-31 11:03:24 +01:00
Tomaz Canabrava
c7d9abbea3
[CSE] Rework pubkeyPath to be able to fetch pubKey
2017-10-30 20:02:55 +01:00
Tomaz Canabrava
a986532442
[CSE] Generate a random password for the metadata.
2017-10-30 19:08:03 +01:00
Tomaz Canabrava
cf56d58241
[CSE] Start the encryption of the metadataKey
2017-10-30 19:05:55 +01:00
Tomaz Canabrava
edb04c137c
[CSE] Call the FolderMetadata
2017-10-30 19:05:32 +01:00
Tomaz Canabrava
c695c50c33
[CSE] Implement the empty metadata
...
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2017-10-30 15:40:05 +01:00
Tomaz Canabrava
5420741edb
Merge branch 'master' into clientSideEncryptionV3
2017-10-30 11:21:36 +01:00
Jenkins for ownCloud
0968d74dad
[tx-robot] updated from transifex
2017-10-30 02:27:13 +01:00
Jenkins for ownCloud
876a1c5140
[tx-robot] updated from transifex
2017-10-29 02:18:42 +01:00
Jenkins for ownCloud
1455636169
[tx-robot] updated from transifex
2017-10-29 02:21:41 +02:00
Jenkins for ownCloud
7ea9a5ca4e
[tx-robot] updated from transifex
2017-10-28 02:18:51 +02:00
Christian Kamm
05c1bfb6cf
Merge remote-tracking branch 'origin/2.4'
2017-10-27 10:29:31 +02:00
Jenkins for ownCloud
2d2ec2a576
[tx-robot] updated from transifex
2017-10-27 02:20:55 +02:00
Jürgen Weigert
17126de5c7
APPLICATION_NAME may contain whitespace
...
Need some quotes to survive in makensis.
2017-10-26 18:44:38 +02:00
Jenkins for ownCloud
e4612ca5d4
[tx-robot] updated from transifex
2017-10-26 02:19:20 +02:00
Jenkins for ownCloud
15af5878b6
[tx-robot] updated from transifex
2017-10-25 02:21:52 +02:00
Jocelyn Turcotte
d9f6468310
Windows: Remove navigation pane entries when uninstalling
...
Issue #5295
2017-10-24 16:10:53 +02:00
Jocelyn Turcotte
10c6951438
Windows: Add a setting to enable/disable the explorer navigation pane integration
...
Issue #5295
2017-10-24 16:10:53 +02:00
Jocelyn Turcotte
56e38e6f80
Windows: Add sync folders to Explorer's navigation pane
...
This is only the navigation pane, the SyncRootManager entries aren't handled yet.
This follows the instructions from:
https://msdn.microsoft.com/en-us/library/windows/desktop/dn889934%28v=vs.85%29.aspx
Issue #5295
2017-10-24 16:10:53 +02:00
Roeland Jago Douma
238f0b3610
Add note
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 15:53:17 +02:00
Roeland Jago Douma
817baf292d
Use EVP_aes_128_gcm
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 15:51:53 +02:00
Roeland Jago Douma
ca6fa7b341
Update decryp function
...
* Do not use AAD
* Do not try to decrypt the last 16 bytes as Android adds the tag there
by default
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 15:51:53 +02:00
Roeland Jago Douma
bacbf337d2
Update encryption function
...
* Do not use padding
* Do not use the ADD data
* Append the tag to the ciphertext to be compatible with Android
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 15:51:53 +02:00
Olivier Goffart
c36043a175
ShareDialog: trigger a sync for folder affected by a change of sharing
...
This allow the sync engine to query the new metadata and update the
overlay icons.
Note: we also need to invalidate the etags because the server does not
change the etag of parent directories that see their share-types changed.
Issue #6098
2017-10-24 15:50:14 +02:00
Olivier Goffart
ee63b36ed3
SyncFileStatusTracker: Detect changed in the shared flag
...
... even if the file is not changed.
We get an UPDATE_METADATA in that case, so make sure we let the
SyncFileStatusTracker know about it.
That means we need to filter out UPDATE_METADATA in the other listeners
of this signal.
Issue #6098
2017-10-24 15:50:14 +02:00
Olivier Goffart
35d28294cd
SyncEngine: remove SyncEngine::syncItemDiscovered
...
It is unused.
2017-10-24 15:50:14 +02:00
Olivier Goffart
c6bd3ab31a
Sharing: remove the ShareManager::_jobContinuation
...
It is growing indefinitively in case of error, causing a leak.
Use a labda instead to pass the capture
2017-10-24 15:50:14 +02:00
