extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-11-22 07:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix key size setting on new filesystems

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/trunk@87 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough 2012-08-22 04:56:28 +00:00
parent 1680008df1
commit a3a676c7d0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
encfs/FileUtils.cpp
View File

@ -1036,7 +1036,6 @@ RootPtr createConfig( EncFS_Context *ctx,
EncfsConfig config; EncfsConfig config;
config.mutable_cipher()->MergeFrom( cipher->interface() ); config.mutable_cipher()->MergeFrom( cipher->interface() );
//config.keySize = keySize;
config.set_block_size( blockSize ); config.set_block_size( blockSize );
config.mutable_naming()->MergeFrom( nameIOIface ); config.mutable_naming()->MergeFrom( nameIOIface );
config.set_creator( "EncFS " VERSION ); config.set_creator( "EncFS " VERSION );
@ -1052,6 +1051,7 @@ RootPtr createConfig( EncFS_Context *ctx,
key->clear_salt(); key->clear_salt();
key->clear_kdf_iterations(); // filled in by keying function key->clear_kdf_iterations(); // filled in by keying function
key->set_kdf_duration( desiredKDFDuration ); key->set_kdf_duration( desiredKDFDuration );
key->set_size(keySize / 8);
cout << "\n"; cout << "\n";
// xgroup(setup) // xgroup(setup)
@ -1588,7 +1588,7 @@ RootPtr initFS( EncFS_Context *ctx, const shared_ptr<EncFS_Opts> &opts )
if(!userKey) if(!userKey)
return rootInfo; return rootInfo;
rDebug("cipher key size = %i", cipher->encodedKeySize()); rDebug("cipher encoded key size = %i", cipher->encodedKeySize());
// decode volume key.. // decode volume key..
CipherKey volumeKey = cipher->readKey( CipherKey volumeKey = cipher->readKey(
(const unsigned char *)config.key().ciphertext().data(), userKey, opts->checkKey); (const unsigned char *)config.key().ciphertext().data(), userKey, opts->checkKey);