mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 18:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
128 Commits 36 Branches 214 Tags
efac7709156077bac6b8341b2ece4a4e7fa3c7ff
Commit Graph

128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel
efac770915 allow adding *.cryptomator files to vault list 2015-02-13 21:22:26 +01:00
Sebastian Stenzel
f29bcc447c - fixed automount on windows 2015-02-13 21:05:16 +01:00
Sebastian Stenzel
5e0ebab587 refactored "add vault" functionality, which fixes #14 
removed some dependencies
refactored Main/MainApplication, which fixes #16
 2015-02-13 19:46:07 +01:00
Sebastian Stenzel
751dbe6b7e Merge pull request #30 from Tillerino/osxNames 
Named mounting (only affects OSX atm)
 2015-01-25 13:44:44 +01:00
Tillmann Gaida
a72f8ba8ab Added the new mount name to the web dav mounter interface. Under OSX, we 
can now use the name, which fixes #5
 2015-01-25 12:42:16 +01:00
Sebastian Stenzel
999285617d Merge pull request #28 from Tillerino/windowsNames 
Pretty network drive names on Windows
 2015-01-25 12:05:04 +01:00
Sebastian Stenzel
addf488b26 Merge pull request #29 from Tillerino/master 
Merged. But we should investigate alternatives to axet's openFileHandler
 2015-01-25 12:04:12 +01:00
Tillmann Gaida
cd5e878a26 Bugfix (magic file open handler broke context class loader for event 
thread)
 2015-01-23 16:25:54 +01:00
Tillmann Gaida
0a671aa9bc Addition of a name to the context path of the WebDAV servlet. The name 
will then appear as the name of the network drive on Windows.
The name is "normalized" down to characters, which are certain to be
accepted. I added a field to the unlock controller, which normalizes the
name as you type.
 2015-01-23 14:28:22 +01:00
Sebastian Stenzel
8cc445a12a New application icon by Thomas Pähler 2015-01-23 00:20:40 +01:00
Sebastian Stenzel
432beb2a17 - fixed #19 (again): vault-specific prefix is now handled by the servlet context instead of jackrabbit. 
- simplified webdav locator, as workspaces and pathPrefixes are not relevant to jackrabbit any longer
 2015-01-22 21:48:52 +01:00
Sebastian Stenzel
9fd271ad7b fixed NPE 2015-01-22 21:42:45 +01:00
Sebastian Stenzel
72b1ff78c3 Merge pull request #27 from Tillerino/master 
Single Running Instance + Double-clicking folders/files shows in GUI
 2015-01-21 20:07:51 +01:00
Tillmann Gaida
edfd264e47 Changes proposed by @totalvoidness in code review 2015-01-21 19:54:10 +01:00
Tillmann Gaida
0cfc3fb7f7 Prevents starting a second instance of the GUI and forwards 
main-method-arguments to the running instance. Command line arguments
are treated by showing the corresponding folder in the GUI.

If an argument is a folder, it is shown directly. If an argument is a
.masterkey.json file, the parent directory is shown. If an argument does
not exist, but the folder can be created, the newly created folder is
shown.

It was necessary to move the main function away from the MainApplication
class because running the main method of a class, which extends the
javafx Application class, will start a non-daemon thread. This prevents
the VM from exiting naturally.

OSX needs its own mechanism, which is implemented in OS-specific code.
It is vital that the required handler is added in the main thread of the
application, not the Java FX thread, which is a bit awkward to
implement. Since it is possible to open .cryptomator packages on OSX,
this extension is now hidden in the folder list.
 2015-01-21 17:35:25 +01:00
Sebastian Stenzel
ecf29a91b8 Update README.md 2015-01-18 15:35:35 +01:00
Sebastian Stenzel
38884c6dfd - added custom info.plist template for OS X native packages (references #14) kudos to @tillerino 2015-01-17 19:57:15 +01:00
Sebastian Stenzel
7813a11381 - pad filenames with NULL bytes (fixes #24) 2015-01-16 19:55:33 +01:00
Sebastian Stenzel
d774546bf8 - pad file contents to reach a multiple of 16 bytes (so AES/CTR always works on complete blocks) - references #24 
- calculate MAC over complete ciphertext (including file length obfuscation trash data)
 2015-01-16 19:50:57 +01:00
Sebastian Stenzel
0b64c7ce25 - Updated exception 2015-01-15 12:29:10 +01:00
Sebastian Stenzel
0aef60efc4 - Single Jetty instnace (fixes #19) 2015-01-15 12:27:10 +01:00
Sebastian Stenzel
f0fa4fcf3d Merge branch 'master' of https://github.com/totalvoidness/open-cloud-encryptor 2015-01-14 19:35:04 +01:00
Sebastian Stenzel
8bfdad38b9 - fixed timing attack on MAC (see http://codahale.com/a-lesson-in-timing-attacks/) 2015-01-14 19:34:36 +01:00
Sebastian Stenzel
19ea81f0e5 Update README.md 2015-01-13 13:57:38 +01:00
Sebastian Stenzel
5e6f343e68 - Updated version to 0.5.0-SNAPSHOT 2015-01-13 11:04:58 +01:00
Sebastian Stenzel
b49eb82f38 - Beta Version 0.4.0 0.4.0 2015-01-13 11:01:42 +01:00
Sebastian Stenzel
523f38c69e - Updated L&F for Mac OS X: Greyed out controls, if window is inactive. 2015-01-10 19:40:20 +01:00
Sebastian Stenzel
3cd3012a05 - fixes #13 2015-01-10 17:01:34 +01:00
Sebastian Stenzel
3ff8d6bc19 - fixed error during exception handling, if trying to decrypt vault with unsupported key length 2015-01-10 15:51:46 +01:00
Sebastian Stenzel
7ce6ed6abb - shows application icon in notification center 2015-01-10 15:23:49 +01:00
Sebastian Stenzel
be0b4859e3 - Adjusted win L&F of checkbox 2015-01-09 15:45:45 +01:00
Sebastian Stenzel
760b2c028f - Some minor improvements, renamed some classes 2015-01-09 15:25:44 +01:00
Sebastian Stenzel
deb10c1256 - Allows the user to configure optional MAC verification before decrypting content (Fixes #17) 2015-01-07 20:00:09 +01:00
Sebastian Stenzel
b6b3360325 - Bugfix broken settings file 2015-01-07 19:59:00 +01:00
Sebastian Stenzel
2e67910a60 - added file integrity check (#17) - not yet visible to the user 2015-01-06 11:39:31 +01:00
Sebastian Stenzel
e19cf1c942 - Changed file layout, added MAC (see #17) 
- Obfuscates file size (fixes #18)
 2015-01-06 01:23:16 +01:00
Sebastian Stenzel
55e758315d - bugfix: using hmac key for hmac operations 2015-01-05 22:34:02 +01:00
Sebastian Stenzel
75fe462eb3 Update README.md 2015-01-05 22:02:00 +01:00
Sebastian Stenzel
0e288f0c84 - fixes #8: Using Scrypt key derivation function now 2015-01-04 18:19:13 +01:00
Sebastian Stenzel
3f2ef3a83a - Using RFC AES 3394 Key Wrap algorithm for storing master keys 
- Storing HMac key and encryption key separately
- Thanks to key wrap, simplified keyfile (no more IV needed)
 2015-01-04 16:32:50 +01:00
Sebastian Stenzel
e90e001718 - Clarified license name (#10) 2015-01-01 22:30:13 +01:00
Sebastian Stenzel
1f8d4c5846 Merge pull request #12 from based2/patch-1 
Various dependencies updates
 2015-01-01 18:04:51 +01:00
based2
d9253be888 update to indent with tabs 2015-01-01 16:56:50 +01:00
based2
2d9fc0a8d8 Various dependencies updates 2014-12-31 13:50:03 +01:00
Sebastian Stenzel
1a076d9c1b - Using hmac_sha256(key, plaintext) instead of sha256(key || plaintext) for IV generation during filename encryption. Still references #7 2014-12-31 11:06:56 +01:00
Sebastian Stenzel
9fe135ef0f - fixes #6, simplifies password verification 
- improves filename IV -> SIV using substring from sha256(secondaryKey + plaintextFilename). References #7
 2014-12-31 01:21:08 +01:00
Sebastian Stenzel
4cb9da7252 - file name encryption is deterministic again (broken by fix for #7) 
- improved unit test to avoid this mistake in the future
 2014-12-30 20:06:05 +01:00
Sebastian Stenzel
ebea3dae65 - Increased file name IV length 2014-12-30 18:13:43 +01:00
Sebastian Stenzel
d8c9279f6f - fixes #7 
- removes any use of CBC mode (might affect issue #9)
 2014-12-30 17:38:57 +01:00
Sebastian Stenzel
4f91adb822 - allow reordering of directories via drag'n'drop 2014-12-28 16:46:14 +01:00