extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2025-06-20 11:47:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix setting of opts in FSConfigPtr. Fixes #74 and #75

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/trunk@61 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough 2010-09-05 21:07:26 +00:00
parent 4bb4049d9e
commit 832d3da98b
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
encfs/FileUtils.cpp
View File

@ -970,12 +970,17 @@ bool selectZeroBlockPassThrough()
"This avoids writing encrypted blocks when file holes are created.")); "This avoids writing encrypted blocks when file holes are created."));
} }
RootPtr createV6Config( EncFS_Context *ctx, const std::string &rootDir, RootPtr createV6Config( EncFS_Context *ctx,
bool enableIdleTracking, bool forceDecode, const shared_ptr<EncFS_Opts> &opts )
const std::string &passwordProgram,
bool useStdin, bool reverseEncryption,
ConfigMode configMode)
{ {
const std::string rootDir = opts->rootDir;
bool enableIdleTracking = opts->idleTracking;
bool forceDecode = opts->forceDecode;
const std::string passwordProgram = opts->passwordProgram;
bool useStdin = opts->useStdin;
bool reverseEncryption = opts->reverseEncryption;
ConfigMode configMode = opts->configMode;
RootPtr rootInfo; RootPtr rootInfo;
// creating new volume key.. should check that is what the user is // creating new volume key.. should check that is what the user is
@ -1222,6 +1227,7 @@ RootPtr createV6Config( EncFS_Context *ctx, const std::string &rootDir,
fsConfig->forceDecode = forceDecode; fsConfig->forceDecode = forceDecode;
fsConfig->reverseEncryption = reverseEncryption; fsConfig->reverseEncryption = reverseEncryption;
fsConfig->idleTracking = enableIdleTracking; fsConfig->idleTracking = enableIdleTracking;
fsConfig->opts = opts;
rootInfo = RootPtr( new EncFS_Root ); rootInfo = RootPtr( new EncFS_Root );
rootInfo->cipher = cipher; rootInfo->cipher = cipher;
@ -1663,6 +1669,7 @@ RootPtr initFS( EncFS_Context *ctx, const shared_ptr<EncFS_Opts> &opts )
fsConfig->config = config; fsConfig->config = config;
fsConfig->forceDecode = opts->forceDecode; fsConfig->forceDecode = opts->forceDecode;
fsConfig->reverseEncryption = opts->forceDecode; fsConfig->reverseEncryption = opts->forceDecode;
fsConfig->opts = opts;
rootInfo = RootPtr( new EncFS_Root ); rootInfo = RootPtr( new EncFS_Root );
rootInfo->cipher = cipher; rootInfo->cipher = cipher;
@ -1674,9 +1681,7 @@ RootPtr initFS( EncFS_Context *ctx, const shared_ptr<EncFS_Opts> &opts )
if(opts->createIfNotFound) if(opts->createIfNotFound)
{ {
// creating a new encrypted filesystem // creating a new encrypted filesystem
rootInfo = createV6Config( ctx, opts->rootDir, opts->idleTracking, rootInfo = createV6Config( ctx, opts );
opts->forceDecode, opts->passwordProgram, opts->useStdin,
opts->reverseEncryption, opts->configMode );
} }
} }

8
encfs/FileUtils.h
View File

@ -110,12 +110,8 @@ class EncFS_Context;
RootPtr initFS( EncFS_Context *ctx, const boost::shared_ptr<EncFS_Opts> &opts ); RootPtr initFS( EncFS_Context *ctx, const boost::shared_ptr<EncFS_Opts> &opts );
RootPtr createV6Config( EncFS_Context *ctx, const std::string &rootDir, RootPtr createV6Config( EncFS_Context *ctx,
bool enableIdleTracking, const boost::shared_ptr<EncFS_Opts> &opts );
bool forceDecode,
const std::string &passwordProgram, bool reverseEncryption,
bool allowHoles, ConfigMode mode );
void showFSInfo( const boost::shared_ptr<EncFSConfig> &config ); void showFSInfo( const boost::shared_ptr<EncFSConfig> &config );