New default block size: 16KB

This commit is contained in:
Sebastian Messmer 2017-09-19 11:20:28 +01:00
parent 51932e6e80
commit 556d9cf452
3 changed files with 12 additions and 8 deletions

View File

@ -8,6 +8,8 @@ New Features & Improvements:
* Use relatime instead of strictatime (further performance improvement) * Use relatime instead of strictatime (further performance improvement)
* Pass fuse options directly to cryfs (i.e. 'cryfs basedir mountdir -o allow_other' instead of 'cryfs basedir mountdir -- -o allow_other') * Pass fuse options directly to cryfs (i.e. 'cryfs basedir mountdir -o allow_other' instead of 'cryfs basedir mountdir -- -o allow_other')
* CryFS tells the operating system to not swap the encryption key to the disk (note: this is best-effort and cannot be guaranteed. Hibernation, for example, will still write the encryption key to the disk) * CryFS tells the operating system to not swap the encryption key to the disk (note: this is best-effort and cannot be guaranteed. Hibernation, for example, will still write the encryption key to the disk)
* New block size options: 4KB and 16KB
* New default block size: 16KB
Fixed bugs: Fixed bugs:
* `du` shows correct file system size on Mac OS X. * `du` shows correct file system size on Mac OS X.

View File

@ -55,15 +55,17 @@ namespace cryfs {
} }
uint32_t CryConfigConsole::_askBlocksizeBytes() const { uint32_t CryConfigConsole::_askBlocksizeBytes() const {
vector<string> sizes = {"8KB", "32KB", "64KB", "512KB", "1MB", "4MB"}; vector<string> sizes = {"4KB", "8KB", "16KB", "32KB", "64KB", "512KB", "1MB", "4MB"};
int index = _console->ask("Which block size do you want to use?", sizes); int index = _console->ask("Which block size do you want to use?", sizes);
switch(index) { switch(index) {
case 0: return 8*1024; case 0: return 4*1024;
case 1: return 32*1024; case 1: return 8*1024;
case 2: return 64*1024; case 2: return 16*1024;
case 3: return 512*1024; case 3: return 32*1024;
case 4: return 1024*1024; case 4: return 64*1024;
case 5: return 4*1024*1024; case 5: return 512*1024;
case 6: return 1024*1024;
case 7: return 4*1024*1024;
default: ASSERT(false, "Unhandled case"); default: ASSERT(false, "Unhandled case");
} }
} }

View File

@ -17,7 +17,7 @@ namespace cryfs {
bool askMissingBlockIsIntegrityViolation(); bool askMissingBlockIsIntegrityViolation();
static constexpr const char *DEFAULT_CIPHER = "aes-256-gcm"; static constexpr const char *DEFAULT_CIPHER = "aes-256-gcm";
static constexpr uint32_t DEFAULT_BLOCKSIZE_BYTES = 32 * 1024; // 32KB static constexpr uint32_t DEFAULT_BLOCKSIZE_BYTES = 16 * 1024; // 16KB
static constexpr uint32_t DEFAULT_MISSINGBLOCKISINTEGRITYVIOLATION = false; static constexpr uint32_t DEFAULT_MISSINGBLOCKISINTEGRITYVIOLATION = false;
private: private: